Commit892d46e

Hiroshi Inoue

committed

1) fix bugs reported by Andrea Aime.

2) fix a bug reported by Jan Wieck.psqlodbc is 7.01.0005 now.

1 parent48bdf02 commit892d46eCopy full SHA for 892d46e

File tree

+26

-10

lines changed

+26

-10

lines changed

Lines changed: 19 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,15 +228,21 @@ getColInfo(COL_INFO col_info, FIELD_INFO fi, int k)`
`228`	`228`	`char`
`229`	`229`	`searchColInfo(COL_INFOcol_info,FIELD_INFOfi)`
`230`	`230`	`{`
`231`		`-intk;`
`232`		`-char*col;`
	`231`	`+intk,cmp;`
	`232`	`+char*col;`
`233`	`233`
`234`	`234`
`235`	`235`	`for (k=0;k<QR_get_num_tuples(col_info->result);k++)`
`236`	`236`	`{`
`237`	`237`	`col=QR_get_value_manual(col_info->result,k,3);`
`238`		`-if (!strcmp(col,fi->name))`
	`238`	`+if (fi->dquote)`
	`239`	`+cmp=strcmp(col,fi->name);`
	`240`	`+else`
	`241`	`+cmp=stricmp(col,fi->name);`
	`242`	`+if (!cmp)`
`239`	`243`	`{`
	`244`	`+if (!fi->dquote)`
	`245`	`+strcpy(fi->name,col);`
`240`	`246`	`getColInfo(col_info,fi,k);`
`241`	`247`
`242`	`248`	`mylog("PARSE: searchColInfo: \n");`
`@@ -393,6 +399,9 @@ parse_statement(StatementClass *stmt)`
`393`	`399`	`{`
`394`	`400`	`blevel--;`
`395`	`401`	`mylog("blevel-- = %d\n",blevel);`
	`402`	`+}`
	`403`	`+if (blevel==0)`
	`404`	`+{`
`396`	`405`	`if (delim==',')`
`397`	`406`	`{`
`398`	`407`	`in_func= FALSE;`
`@@ -569,6 +578,13 @@ parse_statement(StatementClass *stmt)`
`569`	`578`	`ti[stmt->ntab]->alias[0]='\0';`
`570`	`579`
`571`	`580`	`strcpy(ti[stmt->ntab]->name,token);`
	`581`	`+if (!dquote)`
	`582`	`+{`
	`583`	`+char*ptr;`
	`584`	`+/* lower case table name */`
	`585`	`+for (ptr=ti[stmt->ntab]->name;*ptr;ptr++)`
	`586`	`+ptr=tolower((unsignedchar)ptr);`
	`587`	`+}`
`572`	`588`	`mylog("got table = '%s'\n",ti[stmt->ntab]->name);`
`573`	`589`
`574`	`590`	`if (delim==',')`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Comments:See "notice.txt" for copyright and license information.`
`7`	`7`	`*`
`8`		`- * $Id: psqlodbc.h,v 1.41 2001/03/27 04:00:54 momjian Exp $`
	`8`	`+ * $Id: psqlodbc.h,v 1.42 2001/05/0100:47:06 inoue Exp $`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`
`@@ -42,7 +42,7 @@ typedef UInt4 Oid;`
`42`	`42`	`#defineDRIVERNAME"PostgreSQL ODBC"`
`43`	`43`	`#defineDBMS_NAME"PostgreSQL"`
`44`	`44`
`45`		`-#definePOSTGRESDRIVERVERSION"07.01.0004"`
	`45`	`+#definePOSTGRESDRIVERVERSION"07.01.0005"`
`46`	`46`
`47`	`47`	`#ifdefWIN32`
`48`	`48`	`#defineDRIVER_FILE_NAME"PSQLODBC.DLL"`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,8 @@ END`
`342`	`342`	`//`
`343`	`343`
`344`	`344`	`VS_VERSION_INFO VERSIONINFO`
`345`		`- FILEVERSION 7,1,0,4`
`346`		`- PRODUCTVERSION 7,1,0,4`
	`345`	`+ FILEVERSION 7,1,0,5`
	`346`	`+ PRODUCTVERSION 7,1,0,5`
`347`	`347`	`FILEFLAGSMASK 0x3L`
`348`	`348`	`#ifdef _DEBUG`
`349`	`349`	`FILEFLAGS 0x1L`
`@@ -365,14 +365,14 @@ BEGIN`
`365`	`365`	`VALUE "CompanyName", "Insight Distribution Systems\0"`
`366`	`366`	`#endif`
`367`	`367`	`VALUE "FileDescription", "PostgreSQL Driver\0"`
`368`		`- VALUE "FileVersion", " 07.01.0004\0"`
	`368`	`+ VALUE "FileVersion", " 07.01.0005\0"`
`369`	`369`	`VALUE "InternalName", "psqlodbc\0"`
`370`	`370`	`VALUE "LegalCopyright", "\0"`
`371`	`371`	`VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft� is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"`
`372`	`372`	`VALUE "OriginalFilename", "psqlodbc.dll\0"`
`373`	`373`	`VALUE "PrivateBuild", "\0"`
`374`	`374`	`VALUE "ProductName", "Microsoft Open Database Connectivity\0"`
`375`		`- VALUE "ProductVersion", " 07.01.0004\0"`
	`375`	`+ VALUE "ProductVersion", " 07.01.0005\0"`
`376`	`376`	`VALUE "SpecialBuild", "\0"`
`377`	`377`	`END`
`378`	`378`	`END`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ QR_close(QResultClass *self)`
`330`	`330`	`QR_Destructor(res);`
`331`	`331`
`332`	`332`	`/* End the transaction if there are no cursors left on this conn */`
`333`		`-if (CC_cursor_count(self->conn)==0)`
	`333`	`+if (CC_is_in_autocommit(self->conn)&&CC_cursor_count(self->conn)==0)`
`334`	`334`	`{`
`335`	`335`	`mylog("QResult: END transaction on conn=%u\n",self->conn);`
`336`	`336`

Comments

(0)