condition keyword in MySQL ==> conditions.

diff --git a/org.glite.jp.index/config/glite-jp-index-dbsetup.sql b/org.glite.jp.index/config/glite-jp-index-dbsetup.sql
index 485c04f..e0f7f88 100644 (file)
--- a/org.glite.jp.index/config/glite-jp-index-dbsetup.sql
+++ b/org.glite.jp.index/config/glite-jp-index-dbsetup.sql
@@ -29,7 +29,7 @@ create table feeds (
        locked          int             not null,
        source          varchar(255)    not null,
        expires         datetime,
-       condition       mediumblob      null,
+       conditions      mediumblob      null,
 
         primary key (uniqueid),
         index (uniqueid),

diff --git a/org.glite.jp.index/examples/query-tests/dump1.sql b/org.glite.jp.index/examples/query-tests/dump1.sql
index 1953b66..ef17d40 100644 (file)
--- a/org.glite.jp.index/examples/query-tests/dump1.sql
+++ b/org.glite.jp.index/examples/query-tests/dump1.sql
@@ -515,7 +515,7 @@ CREATE TABLE `feeds` (
   `locked` int(11) NOT NULL default '0',
   `source` varchar(255) NOT NULL default '',
   `expires` datetime default NULL,
-  `condition` mediumblob,
+  `conditions` mediumblob,
   PRIMARY KEY  (`uniqueid`),
   UNIQUE KEY `feedid` (`feedid`),
   KEY `uniqueid` (`uniqueid`),

diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c
index 798723f..807fe45 100644 (file)
--- a/org.glite.jp.index/src/db_ops.c
+++ b/org.glite.jp.index/src/db_ops.c
@@ -342,7 +342,7 @@ int glite_jpis_initDatabase(glite_jpis_context_t ctx) {
                GLITE_JP_DB_TYPE_INT, &locked,
                GLITE_JP_DB_TYPE_VARCHAR, source, &source_len,
                GLITE_JP_DB_TYPE_MEDIUMBLOB, dbconds, &dbconds_len);
-       if (glite_jp_db_prepare(jpctx, "INSERT INTO feeds (state, locked, source, condition) VALUES (?, ?, ?, ?)", &stmt, param, NULL) != 0) goto fail;
+       if (glite_jp_db_prepare(jpctx, "INSERT INTO feeds (state, locked, source, conditions) VALUES (?, ?, ?, ?)", &stmt, param, NULL) != 0) goto fail;
        feeds = ctx->conf->feeds;
        i = 0;
        if (feeds) while (feeds[i]) {