sr-dev

sr-dev@lists.kamailio.org

10 participants
42786 discussions

git:janakj/postgres: Handle conversion between DB_BITMAP and postgresql int8 type.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a0d729889a1d5faea3eb2d73ca170698f63624b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0d7298… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Wed May 21 04:18:42 2008 +0000 Handle conversion between DB_BITMAP and postgresql int8 type. --- modules/db_postgres/pg_fld.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index a9690a5..fb1d6fb 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -542,6 +542,7 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) case DB_BITMAP: if (pfld->oid == types[PG_INT2].oid) continue; if (pfld->oid == types[PG_INT4].oid) continue; + if (pfld->oid == types[PG_INT8].oid) continue; if (pfld->oid == types[PG_BIT].oid) continue; if (pfld->oid == types[PG_VARBIT].oid) continue; break; @@ -811,6 +812,8 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, ret |= pg_int2_2_db_int(dst + i, val, len); else if (type == types[PG_INT4].oid) ret |= pg_int4_2_db_int(dst + i, val, len); + else if (type == types[PG_INT8].oid) + ret |= pg_int8_2_db_int(dst + i, val, len); else if (type == types[PG_BIT].oid) ret |= pg_bit2db_int(dst + i, val, len); else if (type == types[PG_VARBIT].oid)

15 years, 2 months

git:janakj/postgres: - support for conversions from int to str

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e28d38dc23a279ca3d2cba6f921dc9bd6b27d5ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e28d38d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 21 12:24:59 2008 +0000 - support for conversions from int to str --- modules/db_postgres/pg_fld.c | 86 ++++++++++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_fld.h | 4 +- modules/db_postgres/pg_mod.c | 2 +- 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index fb1d6fb..8d80f56 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -561,6 +561,8 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_TEXT].oid) continue; if (pfld->oid == types[PG_BPCHAR].oid) continue; if (pfld->oid == types[PG_VARCHAR].oid) continue; + if (pfld->oid == types[PG_INT2].oid) continue; + if (pfld->oid == types[PG_INT4].oid) continue; break; case DB_STR: @@ -570,6 +572,8 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_TEXT].oid) continue; if (pfld->oid == types[PG_BPCHAR].oid) continue; if (pfld->oid == types[PG_VARCHAR].oid) continue; + if (pfld->oid == types[PG_INT2].oid) continue; + if (pfld->oid == types[PG_INT4].oid) continue; break; case DB_DATETIME: @@ -594,6 +598,80 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) } +static inline int pg_int2_2_db_cstr(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int16_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.cstr = pfld->buf; + return 0; +} + + +static inline int pg_int4_2_db_cstr(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int32_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (len < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.cstr = pfld->buf; + return 0; +} + + +static inline int pg_int2_2_db_str(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int16_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.lstr.s = pfld->buf; + fld->v.lstr.len = size; + return 0; +} + + +static inline int pg_int4_2_db_str(db_fld_t* fld, char* val, int len) +{ + struct pg_fld* pfld = DB_GET_PAYLOAD(fld); + int size, v; + + v = (int16_t)ntohs(*((int32_t*)val)); + + size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); + if (size < 0 || size >= INT2STR_MAX_LEN) { + BUG("postgres: Error while converting integer to string\n"); + return -1; + } + + fld->v.lstr.s = pfld->buf; + fld->v.lstr.len = size; + return 0; +} + + static inline int pg_int2_2_db_int(db_fld_t* fld, char* val, int len) { fld->v.int4 = (int16_t)ntohs(*((int16_t*)val)); @@ -793,6 +871,10 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, (type == types[PG_BPCHAR].oid) || (type == types[PG_VARCHAR].oid)) ret |= pg_string2db_cstr(dst + i, val, len); + else if (type == types[PG_INT2].oid) + ret |= pg_int2_2_db_cstr(dst + i, val, len); + else if (type == types[PG_INT4].oid) + ret |= pg_int4_2_db_cstr(dst + i, val, len); else goto bug; break; @@ -804,6 +886,10 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, (type == types[PG_BPCHAR].oid) || (type == types[PG_VARCHAR].oid)) ret |= pg_string2db_str(dst + i, val, len); + else if (type == types[PG_INT2].oid) + ret |= pg_int2_2_db_str(dst + i, val, len); + else if (type == types[PG_INT4].oid) + ret |= pg_int4_2_db_str(dst + i, val, len); else goto bug; break; diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index a42ee4d..a228cf8 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -42,6 +42,7 @@ #include "pg_oid.h" #include "pg_cmd.h" +#include "../../ut.h" #include "../../db/db_gen.h" #include "../../db/db_fld.h" #include <libpq-fe.h> @@ -64,7 +65,8 @@ struct pg_fld { long long int8; /**< 8-byte integer value in network byte order */ char byte[8]; } v; - Oid oid; /**< Type of the field on the server */ + char buf[INT2STR_MAX_LEN]; /**< Buffer for int2str conversions */ + Oid oid; /**< Type of the field on the server */ }; diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 027e4af..2316bb3 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -221,7 +221,7 @@ int pg_test(void) ERR("Error while initializing database layer\n"); goto error; } - if (db_add_db(db, "postgres://janakj:honzacvut@localhost/ser") < 0) goto error; + if (db_add_db(db, "postgres://janakj:heslo@localhost/ser") < 0) goto error; if (db_connect(db) < 0) goto error; del = db_cmd(DB_DEL, db, "test", NULL, NULL, NULL);

15 years, 2 months

git:janakj/postgres: Fix problem in the previous commit: use ntohl() instead of ntohs() when

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 6b51c9e6267c39b21b766081c2126c0402298c62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b51c9e… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Wed May 21 16:30:53 2008 +0000 Fix problem in the previous commit: use ntohl() instead of ntohs() when converting int4 and cast result to int32_t not int16_t. --- modules/db_postgres/pg_fld.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 4bac561..fce1bf6 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -627,7 +627,7 @@ static inline int pg_int4_2_db_cstr(db_fld_t* fld, char* val, int len) struct pg_fld* pfld = DB_GET_PAYLOAD(fld); int size, v; - v = (int16_t)ntohs(*((int32_t*)val)); + v = (int32_t)ntohl(*((int32_t*)val)); size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); if (len < 0 || size >= INT2STR_MAX_LEN) { @@ -664,7 +664,7 @@ static inline int pg_int4_2_db_str(db_fld_t* fld, char* val, int len) struct pg_fld* pfld = DB_GET_PAYLOAD(fld); int size, v; - v = (int16_t)ntohs(*((int32_t*)val)); + v = (int32_t)ntohl(*((int32_t*)val)); size = snprintf(pfld->buf, INT2STR_MAX_LEN, "%-d", v); if (size < 0 || size >= INT2STR_MAX_LEN) {

15 years, 2 months

git:janakj/postgres: - support for timestamptz column type

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c5e7623e00b0c8bbec8f15452f59c4865a47b792 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e7623… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 21 13:05:43 2008 +0000 - support for timestamptz column type --- modules/db_postgres/pg_fld.c | 16 ++++++++--- modules/db_postgres/pg_mod.c | 59 ++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 8d80f56..4bac561 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -301,7 +301,8 @@ int pg_fld2pg(struct pg_params* dst, int off, pg_type_t* types, db_int2pg_int2(dst, off + i, src + i); else if (pfld->oid == types[PG_INT4].oid) db_int2pg_int4(dst, off + i, src + i); - else if (pfld->oid == types[PG_TIMESTAMP].oid) + else if ((pfld->oid == types[PG_TIMESTAMP].oid) || + (pfld->oid == types[PG_TIMESTAMPTZ].oid)) db_int2pg_timestamp(dst, off + i, src + i, flags); else if (pfld->oid == types[PG_INT8].oid) db_int2pg_int8(dst, off + i, src + i); @@ -331,7 +332,8 @@ int pg_fld2pg(struct pg_params* dst, int off, pg_type_t* types, case DB_DATETIME: if (pfld->oid == types[PG_INT4].oid) db_int2pg_int4(dst, off + i, src + i); - else if (pfld->oid == types[PG_TIMESTAMP].oid) + else if ((pfld->oid == types[PG_TIMESTAMP].oid) || + (pfld->oid == types[PG_TIMESTAMPTZ].oid)) db_int2pg_timestamp(dst, off + i, src + i, flags); else if (pfld->oid == types[PG_INT8].oid) db_int2pg_int8(dst, off + i, src + i); @@ -415,6 +417,7 @@ int pg_check_fld2pg(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_BOOL].oid) continue; if (pfld->oid == types[PG_INET].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; if (pfld->oid == types[PG_BIT].oid) continue; if (pfld->oid == types[PG_VARBIT].oid) continue; break; @@ -449,6 +452,7 @@ int pg_check_fld2pg(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_INT4].oid) continue; if (pfld->oid == types[PG_INT8].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; break; default: @@ -535,6 +539,7 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_BOOL].oid) continue; if (pfld->oid == types[PG_INET].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; if (pfld->oid == types[PG_BIT].oid) continue; if (pfld->oid == types[PG_VARBIT].oid) continue; break; @@ -580,6 +585,7 @@ int pg_check_pg2fld(db_fld_t* fld, pg_type_t* types) if (pfld->oid == types[PG_INT2].oid) continue; if (pfld->oid == types[PG_INT4].oid) continue; if (pfld->oid == types[PG_TIMESTAMP].oid) continue; + if (pfld->oid == types[PG_TIMESTAMPTZ].oid) continue; break; default: @@ -832,7 +838,8 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, ret |= pg_bool2db_int(dst + i, val, len); else if (type == types[PG_INET].oid) ret |= pg_inet2db_int(dst + i, val, len); - else if (type == types[PG_TIMESTAMP].oid) + else if ((type == types[PG_TIMESTAMP].oid) || + (type == types[PG_TIMESTAMPTZ].oid)) ret |= pg_timestamp2db_int(dst + i, val, len, flags); else if (type == types[PG_BIT].oid) ret |= pg_bit2db_int(dst + i, val, len); @@ -860,7 +867,8 @@ int pg_pg2fld(db_fld_t* dst, PGresult* src, int row, ret |= pg_int2_2_db_int(dst + i, val, len); else if (type == types[PG_INT4].oid) ret |= pg_int4_2_db_int(dst + i, val, len); - else if (type == types[PG_TIMESTAMP].oid) + else if ((type == types[PG_TIMESTAMP].oid) || + (type == types[PG_TIMESTAMPTZ].oid)) ret |= pg_timestamp2db_int(dst + i, val, len, flags); else goto bug; break; diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 2316bb3..11aa9a9 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -135,20 +135,22 @@ int pg_test(void) char* times; db_fld_t int_vals[] = { - {.name = "col_bool", .type = DB_INT}, - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_inet", .type = DB_INT}, - {.name = "col_timestamp", .type = DB_INT}, - {.name = "col_bit", .type = DB_INT}, - {.name = "col_varbit", .type = DB_INT}, + {.name = "col_bool", .type = DB_INT}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_inet", .type = DB_INT}, + {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_timestamptz", .type = DB_INT}, + {.name = "col_bit", .type = DB_INT}, + {.name = "col_varbit", .type = DB_INT}, {.name = NULL} }; db_fld_t datetime_vals[] = { - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_timestamp", .type = DB_INT}, + {.name = "col_timestamptz", .type = DB_INT}, {.name = NULL} }; @@ -197,21 +199,22 @@ int pg_test(void) db_fld_t res[] = { - {.name = "col_bool", .type = DB_INT}, - {.name = "col_bytea", .type = DB_BLOB}, - {.name = "col_char", .type = DB_STR}, - {.name = "col_int8", .type = DB_INT}, - {.name = "col_int4", .type = DB_INT}, - {.name = "col_int2", .type = DB_INT}, - {.name = "col_text", .type = DB_STR}, - {.name = "col_float4", .type = DB_FLOAT}, - {.name = "col_float8", .type = DB_DOUBLE}, - {.name = "col_inet", .type = DB_INT}, - {.name = "col_bpchar", .type = DB_STR}, - {.name = "col_varchar", .type = DB_STR}, - {.name = "col_timestamp", .type = DB_DATETIME}, - {.name = "col_bit", .type = DB_BITMAP}, - {.name = "col_varbit", .type = DB_BITMAP}, + {.name = "col_bool", .type = DB_INT}, + {.name = "col_bytea", .type = DB_BLOB}, + {.name = "col_char", .type = DB_STR}, + {.name = "col_int8", .type = DB_INT}, + {.name = "col_int4", .type = DB_INT}, + {.name = "col_int2", .type = DB_INT}, + {.name = "col_text", .type = DB_STR}, + {.name = "col_float4", .type = DB_FLOAT}, + {.name = "col_float8", .type = DB_DOUBLE}, + {.name = "col_inet", .type = DB_INT}, + {.name = "col_bpchar", .type = DB_STR}, + {.name = "col_varchar", .type = DB_STR}, + {.name = "col_timestamp", .type = DB_DATETIME}, + {.name = "col_timestamptz", .type = DB_DATETIME}, + {.name = "col_bit", .type = DB_BITMAP}, + {.name = "col_varbit", .type = DB_BITMAP}, {.name = NULL} }; @@ -248,6 +251,7 @@ int pg_test(void) put->vals[4].v.int4 = 0xffffffff; put->vals[5].v.int4 = 0xffffffff; put->vals[6].v.int4 = 0xffffffff; + put->vals[7].v.int4 = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); @@ -261,6 +265,7 @@ int pg_test(void) put->vals[4].v.int4 = 0; put->vals[5].v.int4 = 0; put->vals[6].v.int4 = 0; + put->vals[7].v.int4 = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); @@ -279,6 +284,7 @@ int pg_test(void) put->vals[1].v.int4 = 0xffffffff; put->vals[2].v.int4 = 0xffffffff; put->vals[3].v.int4 = 0xffffffff; + put->vals[4].v.int4 = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -288,6 +294,7 @@ int pg_test(void) put->vals[1].v.int4 = 0; put->vals[2].v.int4 = 0; put->vals[3].v.int4 = 0; + put->vals[4].v.int4 = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -429,6 +436,7 @@ int pg_test(void) put->vals[0].v.time = 0xffffffff; put->vals[1].v.time = 0xffffffff; put->vals[2].v.time = 0xffffffff; + put->vals[3].v.time = 0xffffffff; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error; @@ -437,6 +445,7 @@ int pg_test(void) put->vals[0].v.time = 0; put->vals[1].v.time = 0; put->vals[2].v.time = 0; + put->vals[3].v.time = 0; if (db_exec(NULL, put)) { ERR("Error while executing database command\n"); goto error;

15 years, 2 months

git:janakj/postgres: Merge commit 'pg/master' into postgres

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: ca7cc3fe8c2455b2c57b4b1027394e92283298f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca7cc3f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:49:02 2009 +0100 Merge commit 'pg/master' into postgres * commit 'pg/master': (46 commits) Fix problem in the previous commit: use ntohl() instead of ntohs() when - support for timestamptz column type - support for conversions from int to str Handle conversion between DB_BITMAP and postgresql int8 type. Put back functionality lost during DB API 2.0 conversion. Allo '/' to be We also need <sys/types.h> and <sys/socket.h> to get AF_INET on FreeBSD. Despite what some people believe there is no such thing - parameter name corrected - fixed wrong parameter value passed to PQexecPrepared - removing forgotten files - New postgres driver for the new db api in ser Pass parmeter types to PQexecParams() explicitly, otherwise PostgreSQL - relax db_init BUG check (allow db init from fixup functions) - fix the yesterday's fix: allow db_init from main if it's done from mod_init - fix: db connections should not be opened from child_init(PROC_MAIN), - more warnings fixes - removed reference to serhelp(a)iptel.org, we will be using serusers(a)iptel.org instead - remove test function - DB_FLOAT support - export param types adjusted to PARAM_STR/STRING & PARAM_INT ... ---

15 years, 2 months

git:janakj/postgres: Make the module compile in the sip-router tree.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: b372a1051efca7c5494b87ac2ea277f9816e5703 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b372a10… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 16:59:15 2009 +0100 Make the module compile in the sip-router tree. --- modules/db_postgres/Makefile | 5 ++++- modules/db_postgres/pg_cmd.h | 6 +++--- modules/db_postgres/pg_con.h | 6 +++--- modules/db_postgres/pg_fld.c | 2 +- modules/db_postgres/pg_fld.h | 4 ++-- modules/db_postgres/pg_res.c | 2 +- modules/db_postgres/pg_res.h | 4 ++-- modules/db_postgres/pg_sql.c | 4 ++-- modules/db_postgres/pg_sql.h | 2 +- modules/db_postgres/pg_uri.c | 2 +- modules/db_postgres/pg_uri.h | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 3fe13e8..48857cb 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -8,10 +8,13 @@ NAME=postgres.so # libpq-fe.h locations #DEFS += -DPG_TEST -DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ +DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ -I$(LOCALBASE)/include/postgresql \ -I/usr/include/postgresql -I/usr/include/postgresql/8.0 \ -I/usr/include/pgsql/ LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L /usr/lib -lpq +SERLIBPATH=../../lib +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 + include ../../Makefile.modules diff --git a/modules/db_postgres/pg_cmd.h b/modules/db_postgres/pg_cmd.h index 41914e9..1398d16 100644 --- a/modules/db_postgres/pg_cmd.h +++ b/modules/db_postgres/pg_cmd.h @@ -42,9 +42,9 @@ #include "pg_oid.h" -#include "../../db/db_drv.h" -#include "../../db/db_cmd.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_cmd.h" +#include "../../lib/srdb2/db_res.h" #include "../../str.h" #include <stdarg.h> diff --git a/modules/db_postgres/pg_con.h b/modules/db_postgres/pg_con.h index c5d326a..53c36f2 100644 --- a/modules/db_postgres/pg_con.h +++ b/modules/db_postgres/pg_con.h @@ -41,9 +41,9 @@ #include "pg_oid.h" -#include "../../db/db_pool.h" -#include "../../db/db_con.h" -#include "../../db/db_uri.h" +#include "../../lib/srdb2/db_pool.h" +#include "../../lib/srdb2/db_con.h" +#include "../../lib/srdb2/db_uri.h" #include <time.h> #include <libpq-fe.h> diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index fce1bf6..4353e48 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -40,7 +40,7 @@ #include "pg_con.h" /* flags */ #include "pg_mod.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_drv.h" #include "../../mem/mem.h" #include "../../dprint.h" diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index a228cf8..917f22d 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -43,8 +43,8 @@ #include "pg_oid.h" #include "pg_cmd.h" #include "../../ut.h" -#include "../../db/db_gen.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_gen.h" +#include "../../lib/srdb2/db_fld.h" #include <libpq-fe.h> struct pg_fld { diff --git a/modules/db_postgres/pg_res.c b/modules/db_postgres/pg_res.c index 7580cfc..11dcb78 100644 --- a/modules/db_postgres/pg_res.c +++ b/modules/db_postgres/pg_res.c @@ -41,7 +41,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" static void pg_res_free(db_res_t* res, struct pg_res* payload) diff --git a/modules/db_postgres/pg_res.h b/modules/db_postgres/pg_res.h index 8b87c79..37ae98a 100644 --- a/modules/db_postgres/pg_res.h +++ b/modules/db_postgres/pg_res.h @@ -40,8 +40,8 @@ * servers. */ -#include "../../db/db_drv.h" -#include "../../db/db_res.h" +#include "../../lib/srdb2/db_drv.h" +#include "../../lib/srdb2/db_res.h" #include <libpq-fe.h> diff --git a/modules/db_postgres/pg_sql.c b/modules/db_postgres/pg_sql.c index 37f9a1a..ab572dd 100644 --- a/modules/db_postgres/pg_sql.c +++ b/modules/db_postgres/pg_sql.c @@ -39,8 +39,8 @@ #include "pg_sql.h" -#include "../../db/db_cmd.h" -#include "../../db/db_fld.h" +#include "../../lib/srdb2/db_cmd.h" +#include "../../lib/srdb2/db_fld.h" #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" diff --git a/modules/db_postgres/pg_sql.h b/modules/db_postgres/pg_sql.h index 2ac9d96..84288dc 100644 --- a/modules/db_postgres/pg_sql.h +++ b/modules/db_postgres/pg_sql.h @@ -40,7 +40,7 @@ * PostgreSQL. */ -#include "../../db/db_cmd.h" +#include "../../lib/srdb2/db_cmd.h" #include "../../str.h" diff --git a/modules/db_postgres/pg_uri.c b/modules/db_postgres/pg_uri.c index 02fa494..61accdc 100644 --- a/modules/db_postgres/pg_uri.c +++ b/modules/db_postgres/pg_uri.c @@ -41,7 +41,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../ut.h" -#include "../../db/db_gen.h" +#include "../../lib/srdb2/db_gen.h" #include <stdlib.h> #include <string.h> diff --git a/modules/db_postgres/pg_uri.h b/modules/db_postgres/pg_uri.h index 324855f..2a7ed45 100644 --- a/modules/db_postgres/pg_uri.h +++ b/modules/db_postgres/pg_uri.h @@ -39,8 +39,8 @@ * The implementation of parser parsing postgres://.. URIs. */ -#include "../../db/db_uri.h" -#include "../../db/db_drv.h" +#include "../../lib/srdb2/db_uri.h" +#include "../../lib/srdb2/db_drv.h" /** PostgreSQL driver specific payload to attach to db_uri structures. * This is the PostgreSQL specific structure that will be attached

15 years, 2 months

git:janakj/postgres: Remove compiler warning about uninitialized variable.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e2b6d847e0af1eee4aa77ca42c24fcc439883d5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2b6d84… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 17:03:28 2009 +0100 Remove compiler warning about uninitialized variable. --- modules/db_postgres/pg_oid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_oid.c b/modules/db_postgres/pg_oid.c index bd2833e..52f3e2a 100644 --- a/modules/db_postgres/pg_oid.c +++ b/modules/db_postgres/pg_oid.c @@ -79,7 +79,7 @@ static int get_index(char* name) pg_type_t* pg_new_oid_table(PGresult* res) { pg_type_t* table = NULL; - int row, n, end, idx, fields; + int row, n = 0, end, idx, fields; str s; if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) goto error;

15 years, 2 months

git:janakj/postgres: - remove test function

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 9c2b45c7b429551201b13d3c4db351800730b70a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c2b45c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 16 14:29:34 2006 +0000 - remove test function --- modules/db_postgres/db_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index f6cf5b3..123f057 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -181,7 +181,7 @@ struct module_exports exports = { cmds, 0, /* RPC methods */ params, /* module parameters */ - pg_test, /* module initialization function */ + 0, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0, /* oncancel function */

15 years, 2 months

git:janakj/postgres: - export param types adjusted to PARAM_STR/ STRING & PARAM_INT

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 143572c02572e9aa639c736c49fa82aea1968967 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=143572c… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 8 22:43:14 2006 +0000 - export param types adjusted to PARAM_STR/STRING & PARAM_INT - removed corresponding obsolete strlen(str_param) in init --- modules/db_postgres/db_mod.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 72faf7b..abed575 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * Postgres module interface * @@ -24,8 +24,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -60,8 +60,8 @@ static cmd_export_t cmds[]={ * Exported parameters */ static param_export_t params[] = { - {"connect_timeout", INT_PARAM, &connect_timeout }, - {"reconnect_attempts", INT_PARAM, &reconnect_attempts}, + {"connect_timeout", PARAM_INT, &connect_timeout }, + {"reconnect_attempts", PARAM_INT, &reconnect_attempts}, {0, 0, 0} }; @@ -84,12 +84,12 @@ static param_export_t params[] = { * varbit_col VARBIT NULL * ); * - * insert into test (bool_col, int2_col, int4_col, int8_col, float4_col, float8_col, - * timestamp_col, char_col, text_col, bpchar_col, varchar_col, - * bytea_col, bit_col, varbit_col) - * values - * (true, 22, 23, 24, 25.21, 25.22, '1999-10-18 21:35:00', 'a', - * 'ab', 'a', 'abcde', 'abcdddd', B'00110011001100110011001100110011', + * insert into test (bool_col, int2_col, int4_col, int8_col, float4_col, float8_col, + * timestamp_col, char_col, text_col, bpchar_col, varchar_col, + * bytea_col, bit_col, varbit_col) + * values + * (true, 22, 23, 24, 25.21, 25.22, '1999-10-18 21:35:00', 'a', + * 'ab', 'a', 'abcde', 'abcdddd', B'00110011001100110011001100110011', * b'10101010101010101010101010101010'); */ static int pg_test(void) @@ -120,7 +120,7 @@ static int pg_test(void) } INFO("Result contains %d columns\n", res->col.n); - + for(row = 0; row < res->n; row++) { for(col = 0; col < res->col.n; col++) { switch(res->col.types[col]) { @@ -165,7 +165,7 @@ static int pg_test(void) } -struct module_exports exports = { +struct module_exports exports = { "postgres", cmds, 0, /* RPC methods */

15 years, 2 months

git:janakj/postgres: - DB_FLOAT support

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: bf846b8d43e0f4d30bcc9b3074f605690175bfe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf846b8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Jan 10 22:16:07 2006 +0000 - DB_FLOAT support - fixed error in params_add in postgres module --- modules/db_postgres/db_mod.c | 15 +++++++++++++-- modules/db_postgres/dbase.c | 30 +++++++++++++++++++++++------- modules/db_postgres/res.c | 4 ++++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index abed575..f6cf5b3 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -98,6 +98,8 @@ static int pg_test(void) db_res_t* res; db_con_t* con; struct tm* tt; + db_key_t keys[1]; + db_val_t vals[1]; con = pg_init("postgres://ser:heslo@localhost/ser"); if (!con) { @@ -107,7 +109,12 @@ static int pg_test(void) INFO("Successfuly connected\n"); pg_use_table(con, "test"); - pg_query(con, 0, 0, 0, 0, 0, 0, 0, &res); + keys[0] = "int4_col"; + vals[0].type = DB_INT; + vals[0].nul = 1; + vals[0].val.int_val = 1; + + pg_query(con, keys, 0, vals, 0, 1, 0, 0, &res); if (!res) { ERR("No result received\n"); return -1; @@ -128,6 +135,10 @@ static int pg_test(void) INFO("INT(%d)", res->rows[row].values[col].val.int_val); break; + case DB_FLOAT: + INFO("FLOAT(%f)", res->rows[row].values[col].val.float_val); + break; + case DB_DOUBLE: INFO("DOUBLE(%f)", res->rows[row].values[col].val.double_val); break; @@ -170,7 +181,7 @@ struct module_exports exports = { cmds, 0, /* RPC methods */ params, /* module parameters */ - 0, /* module initialization function */ + pg_test, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0, /* oncancel function */ diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index b0f121e..60ccc95 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -108,7 +108,7 @@ static struct pg_params* new_pg_params(int n) } -static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, int n) +static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, int n, int skip_null) { int i, i1, i2; db_val_t* val; @@ -126,13 +126,29 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, for(i = 0; i < n; i++) { val = &vals[i]; p->formats[p->cur] = 1; - if (val->nul) continue; + if (val->nul) { + /* When assembling parameters for where clause we skip parameters + * that have null values because they are expressed as is null. + * At other places we include them. + */ + if (!skip_null) p->cur++; + continue; + } switch(val->type) { case DB_INT: val->val.int_val = ntohl(val->val.int_val); p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 4; break; + + case DB_FLOAT: + /* Change the byte order of 4-byte value to network + * byte order if necessary + */ + val->val.int_val = htonl(val->val.int_val); + p->data[p->cur] = (const char*)&val->val.int_val; + p->len[p->cur] = 4; + break; case DB_DOUBLE: /* Change the byte order of 8-byte value to network @@ -832,7 +848,7 @@ int pg_query(db_con_t* con, db_key_t* keys, db_op_t* ops, params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(res, con, select, params); @@ -914,7 +930,7 @@ int pg_insert(db_con_t* con, db_key_t* keys, db_val_t* vals, int n) params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 0) < 0) goto err; do { ret = submit_query(0, con, insert, params); @@ -963,7 +979,7 @@ int pg_delete(db_con_t* con, db_key_t* keys, db_op_t* ops, db_val_t* vals, int n params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(0, con, delete, params); @@ -1016,8 +1032,8 @@ int pg_update(db_con_t* con, db_key_t* keys, db_op_t* ops, db_val_t* vals, params = new_pg_params(n + un); if (!params) goto err; - if (params_add(params, con, uvals, un) < 0) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, uvals, un, 0) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(0, con, update, params); diff --git a/modules/db_postgres/res.c b/modules/db_postgres/res.c index 3722ce0..b94e51c 100644 --- a/modules/db_postgres/res.c +++ b/modules/db_postgres/res.c @@ -97,6 +97,9 @@ static inline int get_columns(db_res_t* res) break; case FLOAT4OID: /* single-precision floating point number, 4-byte storage */ + res->col.types[i] = DB_FLOAT; + break; + case FLOAT8OID: /* double-precision floating point number, 8-byte storage */ res->col.types[i] = DB_DOUBLE; break; @@ -195,6 +198,7 @@ static inline int convert_cell(db_con_t* con, db_res_t* res, int row, int col) val->nul = 1; switch(res->col.types[col]) { case DB_INT: val->val.int_val = 0; break; + case DB_FLOAT: val->val.float_val = 0; break; case DB_DOUBLE: val->val.double_val = 0; break; case DB_STRING: val->val.string_val = dummy_str.s; break; case DB_STR: val->val.str_val = dummy_str; break;

15 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev