- Synced preproc.y with gram.y for for-update clause and changes in

handling of numerics

Mon Jan 18 11:22:44 CET 1999

- Added INTERSECT, EXCEPT and UNION for Select statements

- Put keywords.c in sync again after forgettimg it the last time.

- Set version to 2.4.6

MAJOR_VERSION=2

MINOR_VERSION=4

PATCHLEVEL=5

PATCHLEVEL=6

CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION)\

-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\

{"else",ELSE},

{"encoding",ENCODING},

{"end",END_TRANS},

{"except",EXCEPT},

{"execute",EXECUTE},

{"exists",EXISTS},

{"explain",EXPLAIN},

{"insensitive",INSENSITIVE},

{"insert",INSERT},

{"instead",INSTEAD},

{"intersect",INTERSECT},

{"interval",INTERVAL},

{"into",INTO},

{"is",IS},

{"isnull",ISNULL},

{"isolation",ISOLATION},

{"join",JOIN},

{"key",KEY},

{"lancompiler",LANCOMPILER},

{"language",LANGUAGE},

{"leading",LEADING},

{"left",LEFT},

{"level",LEVEL},

{"like",LIKE},

{"listen",LISTEN},

{"load",LOAD},

staticintstruct_level =0;

staticcharerrortext[128];

staticint QueryIsRule =0;

staticint QueryIsRule =0, ForUpdateNotAllowed =0;

staticenum ECPGttype actual_type[STRUCT_DEPTH];

staticchar *actual_storage[STRUCT_DEPTH];

CONSTRAINT,CREATE,CROSS,CURRENT,CURRENT_DATE,CURRENT_TIME,

CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,

DAY_P,DECIMAL,DECLARE,DEFAULT,DELETE,DESC,DISTINCT,DOUBLE,DROP,

ELSE,END_TRANS,EXECUTE,EXISTS,EXTRACT,

ELSE,END_TRANS,EXCEPT,EXECUTE,EXISTS,EXTRACT,

FALSE_P,FETCH,FLOAT,FOR,FOREIGN,FROM,FULL,

GRANT,GROUP,HAVING,HOUR_P,

IN,INNER_P,INSENSITIVE,INSERT,INTERVAL,INTO,IS,ISOLATION,

JOIN,KEY,LANGUAGE,LEADING,LEFT,LEVEL,LIKE,LOCAL,

IN,INNER_P,INSENSITIVE,INSERT,INTERSECT,INTERVAL,INTO,IS,

ISOLATION,JOIN,KEY,LANGUAGE,LEADING,LEFT,LEVEL,LIKE,LOCAL,

MATCH,MINUTE_P,MONTH_P,NAMES,

NATIONAL,NATURAL,NCHAR,NEXT,NO,NOT,NULLIF,NULL_P,NUMERIC,

OF,ON,ONLY,OPTION,OR,ORDER,OUTER_P,

OptStmtList:NOTHING{$$ = make1_str("nothing"); }

|OptimizableStmt{$$ =$1; }

|'['OptStmtBlock']'{$$ = cat3_str(make1_str("["),$2, make1_str("]")); }

|'('OptStmtBlock')'{$$ = cat3_str(make1_str("("),$2, make1_str(")")); }

;

OptStmtBlock:OptStmtMulti

OptStmtMulti:OptStmtMultiOptimizableStmt';'

{$$ = cat3_str($1,$2, make1_str(";")); }

{$$ = cat2_str($1,$2); }

{$$ = cat2_str($1, make1_str(";")); }

;

InsertStmt:INSERTINTOrelation_nameopt_column_listinsert_rest

InsertStmt:INSERTINTOrelation_nameinsert_rest

{

$$ =cat4_str(make1_str("insert into"),$3,$4,$5);

$$ =cat3_str(make1_str("insert into"),$3,$4);

}

;

{

$$ = make1_str("default values");

}

{

$$ = cat4_str(cat5_str(make1_str("select"),$2,$3,$4,$5),$6,$7,$8);

$$ =$1

}

{

$$ = make5_str(make1_str("("),$2, make1_str(") values ("),$6, make1_str(")"));

}

{

$$ = make4_str(make1_str("("),$2, make1_str(")"),$4);

}

;

CursorStmt:DECLAREnameopt_cursorCURSORFOR

CursorStmt:DECLAREnameopt_cursorCURSORFORSelectStmtcursor_clause

{

structcursor *ptr, *this;

this->next = cur;

this->name =$2;

this->command =cat4_str(cat5_str(cat5_str(make1_str("declare"), mm_strdup($2),$3, make1_str("cursor for select"),$7),$8,$9,$10,$11),$12,$13,$14);

this->command = cat2_str(cat5_str(make1_str("declare"), mm_strdup($2),$3, make1_str("cursor for"),$6),$7);

this->argsinsert = argsinsert;

this->argsresult = argsresult;

argsinsert = argsresult =NULL;

SelectStmt:SELECTopt_uniqueres_target_list2

SelectStmt:select_w_o_sortsort_clausefor_update_clause

{

$$ = cat3_str(cat5_str(cat5_str(make1_str("select"),$2,$3,$4,$5),$6,$7,$8,$9),$10,$11);

if (strlen($11) >0)

{

if (strlen($9) >0)

yyerror("SELECT FOR UPDATE is not allowed with UNION clause");

if (strlen($7) >0)

yyerror("SELECT FOR UPDATE is not allowed with GROUP BY clause");

if (strlen($6) >0)

yyerror("SELECT FOR UPDATE is not allowed with HAVING clause");

}

}

;

SubSelect:SELECTopt_uniqueres_target_list2

{

$$ =cat4_str(cat5_str(make1_str("select"),$2,$3,$4,$5),$6,$7,$8);

}

;

if (strlen($3) >0 && ForUpdateNotAllowed !=0)

yyerror("SELECT FOR UPDATE is not allowed in this context");

union_clause:UNIONopt_unionselect_list

{

$$ = cat3_str(make1_str("union"),$2,$3);

ForUpdateNotAllowed =0;

$$ = cat3_str($1,$2,$3);

}

{$$ = make1_str(""); }

;

select_list:select_listUNIONopt_unionSubUnion

{

$$ = cat4_str($1, make1_str("union"),$3,$4);

}

{$$ =$1; }

select_w_o_sort:'('select_w_o_sort')'

{

$$ = make3_str(make1_str("("),$2, make1_str(")"));

}

{

$$ =$1;

}

{

$$ = cat3_str($1, make1_str("except"),$3);

ForUpdateNotAllowed =1;

}

{

$$ = cat3_str($1, make1_str("union"),$3);

ForUpdateNotAllowed =1;

}

{

$$ = cat3_str($1, make1_str("intersect"),$3);

ForUpdateNotAllowed =1;

}

;

SubUnion:SELECTopt_uniqueres_target_list2

SubSelect:SELECTopt_uniqueres_target_list2

{

$$ = cat3_str(cat5_str(make1_str("select"),$2,$3,$4,$5),$6,$7);

$$ = cat4_str(cat5_str(make1_str("select"),$2,$3,$4,$5),$6,$7,$8);

if (strlen($7) >0 || strlen($8) >0)

ForUpdateNotAllowed =1;

}

;

yyerror(errortext);

}

if (strncmp($1,"unix",4) ==0 && strncmp($2,"localhost",9) !=0)

if (strncmp($1,"unix",4) ==0 && strncmp($2 +3,"localhost",9) !=0)

{

sprintf(errortext,"unix domain sockets only work on 'localhost'");

sprintf(errortext,"unix domain sockets only work on 'localhost' but not on '%9.9s'", $2);

yyerror(errortext);

}

all: test1 test2 perftest

LDFLAGS=-g -I../include -I ../../libpq -L../lib -lecpg -L../../libpq -lpq -lcrypt

LDFLAGS=-g -I/usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq -lcrypt

test1: test1.c

test1.c: test1.pgc

../preproc/ecpg$?

/usr/local/pgsql/bin/ecpg$?

test2: test2.c

test2.c: test2.pgc

../preproc/ecpg$?

/usr/local/pgsql/bin/ecpg$?

perftest: perftest.c

perftest.c:perftest.pgc

../preproc/ecpg$?

/usr/local/pgsql/bin/ecpg$?

clean:

/bin/rm test1 test2 perftest*.c log

ECPGdebug(1, dbgs);

strcpy(msg, "connect");

exec sql connect totcp:postgresql://localhost:5432/mm;

exec sql connect tounix:postgresql://localhost:5432/mm;

strcpy(msg, "create");

exec sql create table meskes(name char(8), born integer, age smallint, married char(8));

strcpy(msg, "insert");

exec sql insert into meskes(name, born, age, married) values ('Petra', 19661202,31, '19900404');

exec sql insert into meskes(name, born, age, married) values ('Michael', 19660117,32, '19900404');

exec sql insert into meskes(name, born, age, married) values ('Petra', 19661202,32, '19900404');

exec sql insert into meskes(name, born, age, married) values ('Michael', 19660117,33, '19900404');

exec sql insert into meskes(name, born, age) values ('Carsten', 19910103, 7);

exec sql insert into meskes(name, born, age) values ('Marc', 19930907, 4);

exec sql insert into meskes(name, born, age) values ('Chris', 19970923, 0);