NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit61bee9f

committed

Split ecpg_execute() in constituent parts

Split the rather long ecpg_execute() function into ecpg_build_params(),ecpg_autostart_transaction(), a smaller ecpg_execute() andecpg_process_output(). There is no user-visible change here, only codereorganization to support future patches.Author: Zoltán BöszörményiReviewed by Antonin Houska. Larger, older versions of this patch werereviewed by Noah Misch and Michael Meskes.

1 parent515d2c5 commit61bee9fCopy full SHA for 61bee9f

File tree

42 files changed

+625

-556

lines changed

src/interfaces/ecpg
- ecpglib
  - execute.c
  - extern.h
- test/expected

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+625

-556

lines changed

`‎src/interfaces/ecpg/ecpglib/execute.c‎`

Lines changed: 136 additions & 72 deletions

Large diffs are not rendered by default.

`‎src/interfaces/ecpg/ecpglib/extern.h‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ struct statement`
`63`	`63`	`char*oldlocale;`
`64`	`64`	`intnparams;`
`65`	`65`	`char**paramvalues;`
	`66`	`+PGresult*results;`
`66`	`67`	`};`
`67`	`68`
`68`	`69`	`/* structure to store prepared statements for a connection */`
`@@ -168,10 +169,14 @@ bool ecpg_store_result(const PGresult *results, int act_field,`
`168`	`169`	`conststructstatementstmt,structvariablevar);`
`169`	`170`	`boolecpg_store_input(constint,constbool,conststructvariable,char*,bool);`
`170`	`171`	`voidecpg_free_params(structstatement*stmt,boolprint);`
`171`		`-voidecpg_do_epilogue(structstatement*);`
`172`	`172`	`boolecpg_do_prologue(int,constint,constint,constchar*,constbool,`
`173`	`173`	`enumECPG_statement_type,constchar*,va_list,`
`174`	`174`	`structstatement**);`
	`175`	`+boolecpg_build_params(structstatement*);`
	`176`	`+boolecpg_autostart_transaction(structstatement*stmt);`
	`177`	`+boolecpg_execute(structstatement*stmt);`
	`178`	`+boolecpg_process_output(structstatement*,bool);`
	`179`	`+voidecpg_do_epilogue(structstatement*);`
`175`	`180`	`boolecpg_do(constint,constint,constint,constchar*,constbool,`
`176`	`181`	`constint,constchar*,va_list);`
`177`	`182`

`‎src/interfaces/ecpg/test/expected/compat_informix-describe.stderr‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,37 +6,37 @@`
`6`	`6`	`[NO_PID]: sqlca: code: 0, state: 00000`
`7`	`7`	`[NO_PID]: ecpg_execute on line 30: using PQexec`
`8`	`8`	`[NO_PID]: sqlca: code: 0, state: 00000`
`9`		`-[NO_PID]:ecpg_execute on line 30: OK: SET`
	`9`	`+[NO_PID]:ecpg_process_output on line 30: OK: SET`
`10`	`10`	`[NO_PID]: sqlca: code: 0, state: 00000`
`11`	`11`	`[NO_PID]: ecpg_execute on line 33: query: create table descr_t1 ( id serial primary key , t text ); with 0 parameter(s) on connection regress1`
`12`	`12`	`[NO_PID]: sqlca: code: 0, state: 00000`
`13`	`13`	`[NO_PID]: ecpg_execute on line 33: using PQexec`
`14`	`14`	`[NO_PID]: sqlca: code: 0, state: 00000`
`15`		`-[NO_PID]:ecpg_execute on line 33: OK: CREATE TABLE`
	`15`	`+[NO_PID]:ecpg_process_output on line 33: OK: CREATE TABLE`
`16`	`16`	`[NO_PID]: sqlca: code: 0, state: 00000`
`17`	`17`	`[NO_PID]: ecpg_execute on line 36: query: insert into descr_t1 ( id , t ) values ( default , 'a' ); with 0 parameter(s) on connection regress1`
`18`	`18`	`[NO_PID]: sqlca: code: 0, state: 00000`
`19`	`19`	`[NO_PID]: ecpg_execute on line 36: using PQexec`
`20`	`20`	`[NO_PID]: sqlca: code: 0, state: 00000`
`21`		`-[NO_PID]:ecpg_execute on line 36: OK: INSERT 0 1`
	`21`	`+[NO_PID]:ecpg_process_output on line 36: OK: INSERT 0 1`
`22`	`22`	`[NO_PID]: sqlca: code: 0, state: 00000`
`23`	`23`	`[NO_PID]: ecpg_execute on line 37: query: insert into descr_t1 ( id , t ) values ( default , 'b' ); with 0 parameter(s) on connection regress1`
`24`	`24`	`[NO_PID]: sqlca: code: 0, state: 00000`
`25`	`25`	`[NO_PID]: ecpg_execute on line 37: using PQexec`
`26`	`26`	`[NO_PID]: sqlca: code: 0, state: 00000`
`27`		`-[NO_PID]:ecpg_execute on line 37: OK: INSERT 0 1`
	`27`	`+[NO_PID]:ecpg_process_output on line 37: OK: INSERT 0 1`
`28`	`28`	`[NO_PID]: sqlca: code: 0, state: 00000`
`29`	`29`	`[NO_PID]: ecpg_execute on line 38: query: insert into descr_t1 ( id , t ) values ( default , 'c' ); with 0 parameter(s) on connection regress1`
`30`	`30`	`[NO_PID]: sqlca: code: 0, state: 00000`
`31`	`31`	`[NO_PID]: ecpg_execute on line 38: using PQexec`
`32`	`32`	`[NO_PID]: sqlca: code: 0, state: 00000`
`33`		`-[NO_PID]:ecpg_execute on line 38: OK: INSERT 0 1`
	`33`	`+[NO_PID]:ecpg_process_output on line 38: OK: INSERT 0 1`
`34`	`34`	`[NO_PID]: sqlca: code: 0, state: 00000`
`35`	`35`	`[NO_PID]: ecpg_execute on line 39: query: insert into descr_t1 ( id , t ) values ( default , 'd' ); with 0 parameter(s) on connection regress1`
`36`	`36`	`[NO_PID]: sqlca: code: 0, state: 00000`
`37`	`37`	`[NO_PID]: ecpg_execute on line 39: using PQexec`
`38`	`38`	`[NO_PID]: sqlca: code: 0, state: 00000`
`39`		`-[NO_PID]:ecpg_execute on line 39: OK: INSERT 0 1`
	`39`	`+[NO_PID]:ecpg_process_output on line 39: OK: INSERT 0 1`
`40`	`40`	`[NO_PID]: sqlca: code: 0, state: 00000`
`41`	`41`	`[NO_PID]: ECPGtrans on line 42: action "commit"; connection "regress1"`
`42`	`42`	`[NO_PID]: sqlca: code: 0, state: 00000`
`@@ -104,7 +104,7 @@`
`104`	`104`	`[NO_PID]: sqlca: code: 0, state: 00000`
`105`	`105`	`[NO_PID]: ecpg_execute on line 190: using PQexec`
`106`	`106`	`[NO_PID]: sqlca: code: 0, state: 00000`
`107`		`-[NO_PID]:ecpg_execute on line 190: OK: DROP TABLE`
	`107`	`+[NO_PID]:ecpg_process_output on line 190: OK: DROP TABLE`
`108`	`108`	`[NO_PID]: sqlca: code: 0, state: 00000`
`109`	`109`	`[NO_PID]: ECPGtrans on line 193: action "commit"; connection "regress1"`
`110`	`110`	`[NO_PID]: sqlca: code: 0, state: 00000`

`‎src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`[NO_PID]: sqlca: code: 0, state: 00000`
`7`	`7`	`[NO_PID]: ecpg_execute on line 31: using PQexec`
`8`	`8`	`[NO_PID]: sqlca: code: 0, state: 00000`
`9`		`-[NO_PID]:ecpg_execute on line 31: OK: CREATE TABLE`
	`9`	`+[NO_PID]:ecpg_process_output on line 31: OK: CREATE TABLE`
`10`	`10`	`[NO_PID]: sqlca: code: 0, state: 00000`
`11`	`11`	`[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"`
`12`	`12`	`[NO_PID]: sqlca: code: 0, state: 00000`
`@@ -28,7 +28,7 @@`
`28`	`28`	`[NO_PID]: sqlca: code: 0, state: 00000`
`29`	`29`	`[NO_PID]: ecpg_free_params on line 36: parameter 7 = 404.404`
`30`	`30`	`[NO_PID]: sqlca: code: 0, state: 00000`
`31`		`-[NO_PID]:ecpg_execute on line 36: OK: INSERT 0 1`
	`31`	`+[NO_PID]:ecpg_process_output on line 36: OK: INSERT 0 1`
`32`	`32`	`[NO_PID]: sqlca: code: 0, state: 00000`
`33`	`33`	`[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"`
`34`	`34`	`[NO_PID]: sqlca: code: 0, state: 00000`
`@@ -56,15 +56,15 @@`
`56`	`56`	`[NO_PID]: sqlca: code: 0, state: 00000`
`57`	`57`	`[NO_PID]: ecpg_free_params on line 52: parameter 10 = null`
`58`	`58`	`[NO_PID]: sqlca: code: 0, state: 00000`
`59`		`-[NO_PID]:ecpg_execute on line 52: OK: INSERT 0 1`
	`59`	`+[NO_PID]:ecpg_process_output on line 52: OK: INSERT 0 1`
`60`	`60`	`[NO_PID]: sqlca: code: 0, state: 00000`
`61`	`61`	`[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"`
`62`	`62`	`[NO_PID]: sqlca: code: 0, state: 00000`
`63`	`63`	`[NO_PID]: ecpg_execute on line 59: query: select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1; with 0 parameter(s) on connection regress1`
`64`	`64`	`[NO_PID]: sqlca: code: 0, state: 00000`
`65`	`65`	`[NO_PID]: ecpg_execute on line 59: using PQexec`
`66`	`66`	`[NO_PID]: sqlca: code: 0, state: 00000`
`67`		`-[NO_PID]:ecpg_execute on line 59: correctly got 1 tuples with 10 fields`
	`67`	`+[NO_PID]:ecpg_process_output on line 59: correctly got 1 tuples with 10 fields`
`68`	`68`	`[NO_PID]: sqlca: code: 0, state: 00000`
`69`	`69`	`[NO_PID]: ecpg_get_data on line 59: RESULT: abc offset: -1; array: no`
`70`	`70`	`[NO_PID]: sqlca: code: 0, state: 00000`
`@@ -90,7 +90,7 @@`
`90`	`90`	`[NO_PID]: sqlca: code: 0, state: 00000`
`91`	`91`	`[NO_PID]: ecpg_execute on line 76: using PQexec`
`92`	`92`	`[NO_PID]: sqlca: code: 0, state: 00000`
`93`		`-[NO_PID]:ecpg_execute on line 76: correctly got 1 tuples with 10 fields`
	`93`	`+[NO_PID]:ecpg_process_output on line 76: correctly got 1 tuples with 10 fields`
`94`	`94`	`[NO_PID]: sqlca: code: 0, state: 00000`
`95`	`95`	`[NO_PID]: ecpg_get_data on line 76: RESULT: offset: -1; array: no`
`96`	`96`	`[NO_PID]: sqlca: code: 0, state: 00000`
`@@ -116,7 +116,7 @@`
`116`	`116`	`[NO_PID]: sqlca: code: 0, state: 00000`
`117`	`117`	`[NO_PID]: ecpg_execute on line 91: using PQexec`
`118`	`118`	`[NO_PID]: sqlca: code: 0, state: 00000`
`119`		`-[NO_PID]:ecpg_execute on line 91: OK: DROP TABLE`
	`119`	`+[NO_PID]:ecpg_process_output on line 91: OK: DROP TABLE`
`120`	`120`	`[NO_PID]: sqlca: code: 0, state: 00000`
`121`	`121`	`[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"`
`122`	`122`	`[NO_PID]: sqlca: code: 0, state: 00000`

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!

Commit61bee9f

File tree

42 files changed

Some content is hidden

42 files changed

`‎src/interfaces/ecpg/ecpglib/execute.c‎`

`‎src/interfaces/ecpg/ecpglib/extern.h‎`

`‎src/interfaces/ecpg/test/expected/compat_informix-describe.stderr‎`

`‎src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr‎`

0 commit comments