Skip to content

Commit

Permalink
ECPG: Fix ecpg_log() messages in ecpg_process_output() to reflect
Browse files Browse the repository at this point in the history 
the new function name. A lot of .stderr results have changed.
  • Loading branch information
Böszörményi Zoltán committed Nov 28, 2013
1 parent 161db6a commit 090a6e4
Show file tree
Hide file tree
Showing 41 changed files with 498 additions and 498 deletions.
30 changes: 15 additions & 15 deletions src/interfaces/ecpg/ecpglib/execute.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1515,13 +1515,13 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
case PGRES_TUPLES_OK:
nfields = PQnfields(stmt->results);
sqlca->sqlerrd[2] = ntuples = PQntuples(stmt->results);
ecpg_log("ecpg_execute on line %d: correctly got %d tuples with %d fields\n", stmt->lineno, ntuples, nfields);
ecpg_log("ecpg_process_output on line %d: correctly got %d tuples with %d fields\n", stmt->lineno, ntuples, nfields);
status = true;

if (ntuples < 1)
{
if (ntuples)
ecpg_log("ecpg_execute on line %d: incorrect number of matches (%d)\n",
ecpg_log("ecpg_process_output on line %d: incorrect number of matches (%d)\n",
stmt->lineno, ntuples);
ecpg_raise(stmt->lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL);
status = false;
Expand All @@ -1540,7 +1540,7 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
PQclear(desc->result);
desc->result = stmt->results;
clear_result = false;
ecpg_log("ecpg_execute on line %d: putting result (%d tuples) into descriptor %s\n",
ecpg_log("ecpg_process_output on line %d: putting result (%d tuples) into descriptor %s\n",
stmt->lineno, PQntuples(stmt->results), (const char *) var->pointer);
}
var = var->next;
Expand Down Expand Up @@ -1584,18 +1584,18 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
}
*_sqlda = NULL;

ecpg_log("ecpg_execute on line %d: out of memory allocating a new sqlda\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: out of memory allocating a new sqlda\n", stmt->lineno);
status = false;
break;
}
else
{
ecpg_log("ecpg_execute on line %d: new sqlda was built\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: new sqlda was built\n", stmt->lineno);

*_sqlda = sqlda_new;

ecpg_set_compat_sqlda(stmt->lineno, _sqlda, stmt->results, i, stmt->compat);
ecpg_log("ecpg_execute on line %d: putting result (1 tuple %d fields) into sqlda descriptor\n",
ecpg_log("ecpg_process_output on line %d: putting result (1 tuple %d fields) into sqlda descriptor\n",
stmt->lineno, PQnfields(stmt->results));

sqlda_new->desc_next = sqlda;
Expand Down Expand Up @@ -1640,18 +1640,18 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
}
*_sqlda = NULL;

ecpg_log("ecpg_execute on line %d: out of memory allocating a new sqlda\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: out of memory allocating a new sqlda\n", stmt->lineno);
status = false;
break;
}
else
{
ecpg_log("ecpg_execute on line %d: new sqlda was built\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: new sqlda was built\n", stmt->lineno);

*_sqlda = sqlda_new;

ecpg_set_native_sqlda(stmt->lineno, _sqlda, stmt->results, i, stmt->compat);
ecpg_log("ecpg_execute on line %d: putting result (1 tuple %d fields) into sqlda descriptor\n",
ecpg_log("ecpg_process_output on line %d: putting result (1 tuple %d fields) into sqlda descriptor\n",
stmt->lineno, PQnfields(stmt->results));

sqlda_new->desc_next = sqlda;
Expand Down Expand Up @@ -1689,7 +1689,7 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
cmdstat = PQcmdStatus(stmt->results);
sqlca->sqlerrd[1] = PQoidValue(stmt->results);
sqlca->sqlerrd[2] = atol(PQcmdTuples(stmt->results));
ecpg_log("ecpg_execute on line %d: OK: %s\n", stmt->lineno, cmdstat);
ecpg_log("ecpg_process_output on line %d: OK: %s\n", stmt->lineno, cmdstat);
if (stmt->compat != ECPG_COMPAT_INFORMIX_SE &&
!sqlca->sqlerrd[2] &&
(strncmp(cmdstat, "UPDATE", 6) == 0
Expand All @@ -1702,7 +1702,7 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
char *buffer;
int res;

ecpg_log("ecpg_execute on line %d: COPY OUT data transfer in progress\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: COPY OUT data transfer in progress\n", stmt->lineno);
while ((res = PQgetCopyData(stmt->connection->connection,
&buffer, 0)) > 0)
{
Expand All @@ -1715,9 +1715,9 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
PQclear(stmt->results);
stmt->results = PQgetResult(stmt->connection->connection);
if (PQresultStatus(stmt->results) == PGRES_COMMAND_OK)
ecpg_log("ecpg_execute on line %d: got PGRES_COMMAND_OK after PGRES_COPY_OUT\n", stmt->lineno);
ecpg_log("ecpg_process_output on line %d: got PGRES_COMMAND_OK after PGRES_COPY_OUT\n", stmt->lineno);
else
ecpg_log("ecpg_execute on line %d: got error after PGRES_COPY_OUT: %s", stmt->lineno, PQresultErrorMessage(stmt->results));
ecpg_log("ecpg_process_output on line %d: got error after PGRES_COPY_OUT: %s", stmt->lineno, PQresultErrorMessage(stmt->results));
}
break;
}
Expand All @@ -1727,7 +1727,7 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
* execution should never reach this code because it is already
* handled in ECPGcheck_PQresult()
*/
ecpg_log("ecpg_execute on line %d: unknown execution status type\n",
ecpg_log("ecpg_process_output on line %d: unknown execution status type\n",
stmt->lineno);
ecpg_raise_backend(stmt->lineno, stmt->results, stmt->connection->connection, stmt->compat);
status = false;
Expand All @@ -1743,7 +1743,7 @@ ecpg_process_output(struct statement * stmt, bool clear_result)
notify = PQnotifies(stmt->connection->connection);
if (notify)
{
ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend PID %d received\n",
ecpg_log("ecpg_process_output on line %d: asynchronous notification of \"%s\" from backend PID %d received\n",
stmt->lineno, notify->relname, notify->be_pid);
PQfreemem(notify);
}
Expand Down
14 changes: 7 additions & 7 deletions src/interfaces/ecpg/test/expected/compat_informix-describe.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 30: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 30: OK: SET
[NO_PID]: ecpg_process_output on line 30: OK: SET
[NO_PID]: sqlca: code: 0, state: 00000
[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
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 33: OK: CREATE TABLE
[NO_PID]: ecpg_process_output on line 33: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: query: insert into descr_t1 ( id , t ) values ( default , 'a' ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 36: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 37: query: insert into descr_t1 ( id , t ) values ( default , 'b' ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 37: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 37: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 37: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 38: query: insert into descr_t1 ( id , t ) values ( default , 'c' ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 38: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 38: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 38: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: query: insert into descr_t1 ( id , t ) values ( default , 'd' ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 39: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 42: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
Expand Down Expand Up @@ -104,7 +104,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 190: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 190: OK: DROP TABLE
[NO_PID]: ecpg_process_output on line 190: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 193: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
Expand Down
12 changes: 6 additions & 6 deletions src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 31: OK: CREATE TABLE
[NO_PID]: ecpg_process_output on line 31: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
Expand All @@ -28,7 +28,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_free_params on line 36: parameter 7 = 404.404
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 36: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
Expand Down Expand Up @@ -56,15 +56,15 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_free_params on line 52: parameter 10 = null
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
[NO_PID]: ecpg_process_output on line 52: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[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
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 59: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 59: correctly got 1 tuples with 10 fields
[NO_PID]: ecpg_process_output on line 59: correctly got 1 tuples with 10 fields
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 59: RESULT: abc offset: -1; array: no
[NO_PID]: sqlca: code: 0, state: 00000
Expand All @@ -90,7 +90,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 76: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 76: correctly got 1 tuples with 10 fields
[NO_PID]: ecpg_process_output on line 76: correctly got 1 tuples with 10 fields
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 76: RESULT: offset: -1; array: no
[NO_PID]: sqlca: code: 0, state: 00000
Expand All @@ -116,7 +116,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 91: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
[NO_PID]: ecpg_process_output on line 91: OK: DROP TABLE
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
Expand Down
Loading

0 comments on commit 090a6e4

Please sign in to comment.