Module: sip-router Branch: 4.0 Commit: d8606ec25cc4083a9c425639f14f0bbe26768f7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8606ec… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Mon Mar 4 16:14:42 2013 +0100 db_postgres: handle prepare statements in DB APIv2 - patch by Markus Bucher, closes FS#272 (cherry picked from commit 09c7b67beee9529d6a7c06e600c7f294bf453eda) --- modules/db_postgres/pg_cmd.c | 71 +++++++++++++++++++++++++++++++++++++++++- modules/db_postgres/pg_fld.c | 1 + modules/db_postgres/pg_fld.h | 1 + 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index eec1c1b..db7ad66 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -198,19 +198,88 @@ static int get_types(db_cmd_t* cmd) { struct pg_cmd* pcmd; struct pg_con* pcon; + int i, n; + pg_type_t *types; pcmd = DB_GET_PAYLOAD(cmd); /* FIXME */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); + types = pcon->oid; pcmd->types = PQdescribePrepared(pcon->con, pcmd->name); if (PQresultStatus(pcmd->types) != PGRES_COMMAND_OK) { ERR("postgres: Error while obtaining description of prepared statement\n"); return -1; } + /* adapted from check_result() in db_mysql */ + n = PQnfields(pcmd->types); + if (cmd->result == NULL) { + /* The result set parameter of db_cmd function was empty, that + * means the command is select * and we have to create the array + * of result fields in the cmd structure manually. + */ + cmd->result = db_fld(n + 1); + cmd->result_count = n; + for(i = 0; i < cmd->result_count; i++) { + struct pg_fld *f; + if (pg_fld(cmd->result + i, cmd->table.s) < 0) goto error; + f = DB_GET_PAYLOAD(cmd->result + i); + f->name = pkg_malloc(strlen(PQfname(pcmd->types, i))+1); + if (f->name == NULL) { + ERR("postgres: Out of private memory\n"); + goto error; + } + strcpy(f->name, PQfname(pcmd->types, i)); + cmd->result[i].name = f->name; + } + } else { + if (cmd->result_count != n) { + BUG("postgres: Number of fields in PQresult does not match number of parameters in DB API\n"); + goto error; + } + } + + /* Now iterate through all the columns in the result set and replace + * any occurrence of DB_UNKNOWN type with the type of the column + * retrieved from the database and if no column name was provided then + * update it from the database as well. + */ + for(i = 0; i < cmd->result_count; i++) { + Oid type = PQftype(pcmd->types, i); + if (cmd->result[i].type != DB_NONE) continue; + + if ((type == types[PG_INT2].oid) || (type == types[PG_INT4].oid) || (type == types[PG_INT8].oid)) + cmd->result[i].type = DB_INT; + else if (type == types[PG_FLOAT4].oid) + cmd->result[i].type = DB_FLOAT; + + else if (type == types[PG_FLOAT8].oid) + cmd->result[i].type = DB_DOUBLE; + + else if ((type == types[PG_TIMESTAMP].oid) || (type == types[PG_TIMESTAMPTZ].oid)) + cmd->result[i].type = DB_DATETIME; + + else if ((type == types[PG_VARCHAR].oid) || (type == types[PG_CHAR].oid) || (type == types[PG_TEXT].oid)) + cmd->result[i].type = DB_STR; + + else if ((type == types[PG_BIT].oid) || (type == types[PG_VARBIT].oid)) + cmd->result[i].type = DB_BITMAP; + + else if (type == types[PG_BYTE].oid) + cmd->result[i].type = DB_BLOB; + + else + { + ERR("postgres: Unsupported PostgreSQL column type: %d, table: %s, column: %s\n", + type, cmd->table.s, PQfname(pcmd->types, i)); + goto error; + } + } return 0; +error: + return -1; } @@ -352,7 +421,7 @@ static int upload_cmd(db_cmd_t* cmd) DBG("postgres: Uploading command '%s': '%s'\n", pcmd->name, pcmd->sql_cmd.s); - res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, 0, NULL); + res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, (cmd->match_count + cmd->vals_count), NULL); st = PQresultStatus(res); diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 76ad4df..46d54f0 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -62,6 +62,7 @@ static void pg_fld_free(db_fld_t* fld, struct pg_fld* payload) { db_drv_free(&payload->gen); + if (payload->name) pkg_free(payload->name); pkg_free(payload); } diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index 09b9926..6cd9021 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -47,6 +47,7 @@ struct pg_fld { db_drv_t gen; + char* name; /** * A union of varius data types from db_fld, postgres expects binary * data in network byte order so we use these variables as temporary