NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitccab6f7

committed

Remove int16 from libpgeasy examples. Improve error reporting.

1 parent936ff27 commitccab6f7Copy full SHA for ccab6f7

File tree

3 files changed

-21

lines changed

src/interfaces/libpgeasy
- examples
  - pginsert.c
  - pgnulltest.c
- libpgeasy.c

3 files changed

-21

lines changed

`‎src/interfaces/libpgeasy/examples/pginsert.c`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ main(int argc, char **argv)`
`18`	`18`	`floatafloat;`
`19`	`19`	`doubleadouble;`
`20`	`20`	`charachar[11],`
`21`		`-achar16[17],`
`22`	`21`	`abpchar[11],`
`23`	`22`	`avarchar[51],`
`24`	`23`	`atext[51];`
`@@ -41,7 +40,6 @@ main(int argc, char **argv)`
`41`	`40`	`afloat float4, \`
`42`	`41`	`adouble float8, \`
`43`	`42`	`acharchar, \`
`44`		`-achar16char(16), \`
`45`	`43`	`abpchar char(10), \`
`46`	`44`	`avarchar varchar(50), \`
`47`	`45`	`atexttext, \`
`@@ -58,7 +56,6 @@ main(int argc, char **argv)`
`58`	`56`	`'Betty', \`
`59`	`57`	`'Charley', \`
`60`	`58`	`'Doug', \`
`61`		`-'Ernie', \`
`62`	`59`	`'now' )",row);`
`63`	`60`	`doquery(query);`
`64`	`61`
`@@ -73,18 +70,16 @@ main(int argc, char **argv)`
`73`	`70`	`&afloat,`
`74`	`71`	`&adouble,`
`75`	`72`	`achar,`
`76`		`-achar16,`
`77`	`73`	`abpchar,`
`78`	`74`	`avarchar,`
`79`	`75`	`atext,`
`80`	`76`	`&aabstime)!=END_OF_TUPLES)`
`81`		`-printf("int %d\nfloat %f\ndouble %f\nchar %s\nchar16 %s\n\`
	`77`	`+printf("int %d\nfloat %f\ndouble %f\nchar %s\n\`
`82`	`78`	`bpchar %s\nvarchar %s\ntext %s\nabstime %s",`
`83`	`79`	`aint,`
`84`	`80`	`afloat,`
`85`	`81`	`adouble,`
`86`	`82`	`achar,`
`87`		`-achar16,`
`88`	`83`	`abpchar,`
`89`	`84`	`avarchar,`
`90`	`85`	`atext,`

`‎src/interfaces/libpgeasy/examples/pgnulltest.c`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ main(int argc, char **argv)`
`20`	`20`	`floatafloat;`
`21`	`21`	`doubleadouble;`
`22`	`22`	`charachar[11],`
`23`		`-achar16[17],`
`24`	`23`	`abpchar[11],`
`25`	`24`	`avarchar[51],`
`26`	`25`	`atext[51];`
`@@ -29,7 +28,6 @@ main(int argc, char **argv)`
`29`	`28`	`afloat_null,`
`30`	`29`	`adouble_null,`
`31`	`30`	`achar_null,`
`32`		`-achar16_null,`
`33`	`31`	`abpchar_null,`
`34`	`32`	`avarchar_null,`
`35`	`33`	`atext_null,`
`@@ -52,7 +50,6 @@ main(int argc, char **argv)`
`52`	`50`	`afloat float4, \`
`53`	`51`	`adouble float8, \`
`54`	`52`	`achar char, \`
`55`		`- achar16 char(16), \`
`56`	`53`	`abpchar char(10), \`
`57`	`54`	`avarchar varchar(50), \`
`58`	`55`	`atext text, \`
`@@ -68,8 +65,7 @@ main(int argc, char **argv)`
`68`	`65`	`'', \`
`69`	`66`	`'', \`
`70`	`67`	`'', \`
`71`		`-'', \`
`72`		`-'');");`
	`68`	`+CURRENT_TIMESTAMP::abstime);");`
`73`	`69`	`#else`
`74`	`70`	`sprintf(query,"INSERT INTO testfetch VALUES ( \`
`75`	`71`	`NULL, \`
`@@ -79,7 +75,6 @@ main(int argc, char **argv)`
`79`	`75`	`NULL, \`
`80`	`76`	`NULL, \`
`81`	`77`	`NULL, \`
`82`		`-NULL, \`
`83`	`78`	`NULL);");`
`84`	`79`	`#endif`
`85`	`80`	`doquery(query);`
`@@ -99,8 +94,6 @@ main(int argc, char **argv)`
`99`	`94`	`&adouble_null,`
`100`	`95`	`achar,`
`101`	`96`	`&achar_null,`
`102`		`-achar16,`
`103`		`-&achar16_null,`
`104`	`97`	`abpchar,`
`105`	`98`	`&abpchar_null,`
`106`	`99`	`avarchar,`
`@@ -109,30 +102,28 @@ main(int argc, char **argv)`
`109`	`102`	`&atext_null,`
`110`	`103`	`&aabstime,`
`111`	`104`	`&aabstime_null)!=END_OF_TUPLES)`
`112`		`-printf("int %d\nfloat %f\ndouble %f\nchar %s\nchar16 %s\n\`
	`105`	`+printf("int %d\nfloat %f\ndouble %f\nchar %s\n\`
`113`	`106`	`bpchar %s\nvarchar %s\ntext %s\nabstime %s\n",`
`114`	`107`	`aint,`
`115`	`108`	`afloat,`
`116`	`109`	`adouble,`
`117`	`110`	`achar,`
`118`		`-achar16,`
`119`	`111`	`abpchar,`
`120`	`112`	`avarchar,`
`121`	`113`	`atext,`
`122`	`114`	`ctime(&aabstime));`
`123`		`-printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\nchar16 %d\n\`
	`115`	`+`
	`116`	`+printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\n\`
`124`	`117`	`bpchar %d\nvarchar %d\ntext %d\nabstime %d\n",`
`125`	`118`	`aint_null,`
`126`	`119`	`afloat_null,`
`127`	`120`	`adouble_null,`
`128`	`121`	`achar_null,`
`129`		`-achar16_null,`
`130`	`122`	`abpchar_null,`
`131`	`123`	`avarchar_null,`
`132`	`124`	`atext_null,`
`133`	`125`	`aabstime_null);`
`134`	`126`
`135`		`-`
`136`	`127`	`doquery("CLOSE c_testfetch");`
`137`	`128`	`doquery("COMMIT WORK");`
`138`	`129`	`printf("--- %-d rows inserted so far\n",row);`

`‎src/interfaces/libpgeasy/libpgeasy.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,11 @@ doquery(char *query)`
`92`	`92`	`PQresultStatus(res)==PGRES_FATAL_ERROR))`
`93`	`93`	`{`
`94`	`94`	`if (res!=NULL)`
`95`		`-fprintf(stderr,"query error: %s\n",PQcmdStatus(res));`
	`95`	`+fprintf(stderr,"query error: %s\n",PQresultErrorMessage(res));`
`96`	`96`	`else`
`97`	`97`	`fprintf(stderr,"connection error: %s\n",PQerrorMessage(conn));`
`98`	`98`	`PQfinish(conn);`
`99`		`-halt("failedrequest: %s\n",query);`
	`99`	`+halt("failedquery: %s\n",query);`
`100`	`100`	`}`
`101`	`101`	`tuple=0;`
`102`	`102`	`returnres;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitccab6f7

File tree

3 files changed

3 files changed

`‎src/interfaces/libpgeasy/examples/pginsert.c`

`‎src/interfaces/libpgeasy/examples/pgnulltest.c`

`‎src/interfaces/libpgeasy/libpgeasy.c`

0 commit comments