Module: sip-router Branch: master Commit: d23aff6ed1e42b1c81b60805f3c1d5fea94cf310 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d23aff6… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Fri Aug 19 12:23:05 2011 +0200 srdb1: column expires in htable set to type int - it was string, reported by Mészáros Mihály --- lib/srdb1/schema/htable.xml | 2 +- utils/kamctl/db_berkeley/kamailio/htable | 2 +- utils/kamctl/db_berkeley/kamailio/version | 2 ++ utils/kamctl/db_sqlite/htable-create.sql | 2 +- utils/kamctl/dbtext/kamailio/htable | 2 +- utils/kamctl/dbtext/kamailio/version | 1 + utils/kamctl/mysql/htable-create.sql | 2 +- utils/kamctl/oracle/htable-create.sql | 2 +- utils/kamctl/postgres/htable-create.sql | 2 +- 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/srdb1/schema/htable.xml b/lib/srdb1/schema/htable.xml index 913bcc1..b820d23 100644 --- a/lib/srdb1/schema/htable.xml +++ b/lib/srdb1/schema/htable.xml @@ -58,7 +58,7 @@ <column id="expires"> <name>expires</name> - <type>string</type> + <type>int</type> <default>0</default> <description>The epoch at which the key expires</description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/htable b/utils/kamctl/db_berkeley/kamailio/htable index 5a0b29c..dfc53a1 100644 --- a/utils/kamctl/db_berkeley/kamailio/htable +++ b/utils/kamctl/db_berkeley/kamailio/htable @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) key_name(str) key_type(int) value_type(int) key_value(str) expires(str) +id(int) key_name(str) key_type(int) value_type(int) key_value(str) expires(int) METADATA_KEY METADATA_READONLY diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 030f358..f5c5a19 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -28,6 +28,8 @@ dbaliases| dbaliases|1 dialog| dialog|5 +METADATA_DEFAULTS +NIL|NIL|NIL|NIL|NIL dialplan| dialplan|1 dispatcher| diff --git a/utils/kamctl/db_sqlite/htable-create.sql b/utils/kamctl/db_sqlite/htable-create.sql index 990334f..494bc39 100644 --- a/utils/kamctl/db_sqlite/htable-create.sql +++ b/utils/kamctl/db_sqlite/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INTEGER DEFAULT 0 NOT NULL, value_type INTEGER DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INTEGER DEFAULT 0 NOT NULL ); diff --git a/utils/kamctl/dbtext/kamailio/htable b/utils/kamctl/dbtext/kamailio/htable index 1abd0d5..55a9ac4 100644 --- a/utils/kamctl/dbtext/kamailio/htable +++ b/utils/kamctl/dbtext/kamailio/htable @@ -1 +1 @@ -id(int,auto) key_name(string) key_type(int) value_type(int) key_value(string) expires(string) +id(int,auto) key_name(string) key_type(int) value_type(int) key_value(string) expires(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 85315a2..f1516c8 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -9,6 +9,7 @@ carrierroute:3 cpl:1 dbaliases:1 dialog:5 +id(int,auto) hash_entry(int) hash_id(int) dialog_key(string) dialog_value(string) dialplan:1 dispatcher:4 domain:1 diff --git a/utils/kamctl/mysql/htable-create.sql b/utils/kamctl/mysql/htable-create.sql index 6adfa48..79eb43b 100644 --- a/utils/kamctl/mysql/htable-create.sql +++ b/utils/kamctl/mysql/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INT DEFAULT 0 NOT NULL, value_type INT DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INT DEFAULT 0 NOT NULL ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/htable-create.sql b/utils/kamctl/oracle/htable-create.sql index 0ccb6b1..7748aae 100644 --- a/utils/kamctl/oracle/htable-create.sql +++ b/utils/kamctl/oracle/htable-create.sql @@ -5,7 +5,7 @@ CREATE TABLE htable ( key_type NUMBER(10) DEFAULT 0 NOT NULL, value_type NUMBER(10) DEFAULT 0 NOT NULL, key_value VARCHAR2(128) DEFAULT '', - expires VARCHAR2 DEFAULT 0 NOT NULL + expires NUMBER(10) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER htable_tr diff --git a/utils/kamctl/postgres/htable-create.sql b/utils/kamctl/postgres/htable-create.sql index 705ca0e..a63245a 100644 --- a/utils/kamctl/postgres/htable-create.sql +++ b/utils/kamctl/postgres/htable-create.sql @@ -5,6 +5,6 @@ CREATE TABLE htable ( key_type INTEGER DEFAULT 0 NOT NULL, value_type INTEGER DEFAULT 0 NOT NULL, key_value VARCHAR(128) DEFAULT '' NOT NULL, - expires VARCHAR DEFAULT 0 NOT NULL + expires INTEGER DEFAULT 0 NOT NULL );