Commit244d2d6

Michael Meskes

committed

Added Informix "database" command.

1 parent72933a9 commit244d2d6Copy full SHA for 244d2d6

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,10 @@ boolECPGdisconnect(int, const char *);`
`49`	`49`	`boolECPGprepare(int,char,char);`
`50`	`50`	`boolECPGdeallocate(int,char*);`
`51`	`51`	`boolECPGdeallocate_all(int);`
`52`		`-charECPGprepared_statement(char);`
	`52`	`+charECPGprepared_statement(char);`
`53`	`53`
`54`	`54`	`voidECPGlog(constchar*format,...);`
	`55`	`+char*ECPGerrmsg(void);`
`55`	`56`
`56`	`57`	`/* print an error message */`
`57`	`58`	`voidsqlprint(void);`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.105 2003/02/14 16:40:01 meskes Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.106 2003/02/17 14:06:39 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -969,7 +969,8 @@ cppline{space}#(.\\{space}).`
`969`	`969`	`yyin =NULL;`
`970`	`970`
`971`	`971`	`/* If file name is enclosed in '"' remove these and look only in '.' */`
`972`		`-if (yytext[0] =='"' && yytext[i] =='"')`
	`972`	`+/* Informix does look into all include paths though, except filename starts with '/' */`
	`973`	`+if ((yytext[0] =='"' && yytext[i] =='"') && (compat != ECPG_COMPAT_INFORMIX \|\| yytext[0] =='/'))`
`973`	`974`	`{`
`974`	`975`	`yytext[i] ='\0';`
`975`	`976`	`memmove(yytext, yytext+1,strlen(yytext));`
`@@ -988,6 +989,12 @@ cppline{space}#(.\\{space}).`
`988`	`989`	`}`
`989`	`990`	`else`
`990`	`991`	`{`
	`992`	`+if (yytext[0] =='"' && yytext[i] =='"')`
	`993`	`+{`
	`994`	`+yytext[i] ='\0';`
	`995`	`+memmove(yytext, yytext+1,strlen(yytext));`
	`996`	`+}`
	`997`	`+`
`991`	`998`	`for (ip = include_paths; yyin ==NULL && ip !=NULL; ip = ip->next)`
`992`	`999`	`{`
`993`	`1000`	`if (strlen(ip->path) +strlen(yytext) +3 > MAXPGPATH)`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.208 2003/02/14 13:17:13 meskes Exp $*/`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.209 2003/02/17 14:06:40 meskes Exp $*/`
`2`	`2`
`3`	`3`	`/* Copyright comment*/`
`4`	`4`	`%{`
`@@ -153,7 +153,7 @@ make_name(void)`
`153`	`153`	`/* special embedded SQL token*/`
`154`	`154`	`%tokenSQL_ALLOCATESQL_AUTOCOMMITSQL_BOOLSQL_BREAK`
`155`	`155`	`SQL_CALLSQL_CARDINALITYSQL_CONNECTSQL_CONNECTION`
`156`		`-SQL_CONTINUESQL_COUNTSQL_CURRENTSQL_DATA`
	`156`	`+SQL_CONTINUESQL_COUNTSQL_CURRENTSQL_DATA`
`157`	`157`	`SQL_DATETIME_INTERVAL_CODE`
`158`	`158`	`SQL_DATETIME_INTERVAL_PRECISION`
`159`	`159`	`SQL_DESCRIPTORSQL_DISCONNECTSQL_ENUMSQL_FOUND`
`@@ -3889,6 +3889,8 @@ ECPGConnect: SQL_CONNECT TO connection_target opt_connection_name opt_user`
`3889`	`3889`	`/* also allow ORACLE syntax*/`
`3890`	`3890`	`\|SQL_CONNECTora_user`
`3891`	`3891`	`{$$ = cat_str(3, make_str("NULL,"),$2, make_str(",NULL")); }`
	`3892`	`+\|DATABASEconnection_target`
	`3893`	`+{$$ = cat2_str($2, make_str(",NULL,NULL,NULL")); }`
`3892`	`3894`	`;`
`3893`	`3895`
`3894`	`3896`	`connection_target:database_nameopt_serveropt_port`

Comments

(0)