New Feature #05269: Use ExpressionManager for Branching logic as opti…

…onal alternative to Conditions Dev renamed group-level relevance field to 'grelevance' to avoid confusion with question level 'relevance'. Since no production systems using this yet, kept at DB version 154 git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev_tms@11588 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 5, 2011 · da4105f · da4105f
1 parent cce443a
commit da4105f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/admin/install/create-mssql.sql b/admin/install/create-mssql.sql
@@ -91,7 +91,7 @@ CREATE TABLE [prefix_groups] (
   [description] text NULL,
   [language] VARCHAR(20) default 'en',
   [randomization_group] VARCHAR(20) NOT NULL default '',
-  [relevance] text NULL,
+  [grelevance] text NULL,
   PRIMARY KEY  ([gid],[language])
 )
 ;

diff --git a/admin/install/create-mssqlnative.sql b/admin/install/create-mssqlnative.sql
@@ -95,7 +95,7 @@ CREATE TABLE [prefix_groups] (
   [description] varchar(max),
   [language] VARCHAR(20) default 'en',
   [randomization_group] VARCHAR(20) NOT NULL default '',
-  [relevance] varchar(max),
+  [grelevance] varchar(max),
   PRIMARY KEY  ([gid],[language])
 )
 ;

diff --git a/admin/install/create-mysql.sql b/admin/install/create-mysql.sql
@@ -87,7 +87,7 @@ CREATE TABLE `prefix_groups` (
   `description` text,
   `language` varchar(20) default 'en',
   `randomization_group` varchar(20) NOT NULL default '',
-  `relevance` text,
+  `grelevance` text,
   PRIMARY KEY  (`gid`,`language`)
 ) ENGINE=$databasetabletype AUTO_INCREMENT=1 CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 

diff --git a/admin/install/create-postgres.sql b/admin/install/create-postgres.sql
@@ -96,7 +96,7 @@ CREATE TABLE prefix_groups (
     description text,
     "language" character varying(20) DEFAULT 'en'::character varying NOT NULL,
     randomization_group varying(20) DEFAULT ''::character varying NOT NULL,
-    relevance text,
+    grelevance text,
     CONSTRAINT prefix_groups_pkey PRIMARY KEY (gid, "language")
 );
 

diff --git a/admin/update/upgrade-mssql.php b/admin/update/upgrade-mssql.php
@@ -589,7 +589,7 @@ function db_upgrade($oldversion) {
     }
     if ($oldversion < 154)
     {
-        modify_database("","ALTER TABLE [prefix_groups] ADD [relevance] text;"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","ALTER TABLE [prefix_groups] ADD [grelevance] text;"); echo $modifyoutput; flush();@ob_flush();
         modify_database("", "UPDATE [prefix_settings_global] SET stg_value='154' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
     echo '<br /><br />'.sprintf($clang->gT('Database update finished (%s)'),date('Y-m-d H:i:s')).'<br />';

diff --git a/admin/update/upgrade-mssqlnative.php b/admin/update/upgrade-mssqlnative.php
@@ -588,7 +588,7 @@ function db_upgrade($oldversion) {
     }
     if ($oldversion < 154)
     {
-        modify_database("","ALTER TABLE [prefix_groups] ADD [relevance] text;"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","ALTER TABLE [prefix_groups] ADD [grelevance] text;"); echo $modifyoutput; flush();@ob_flush();
         modify_database("","update [prefix_settings_global] set [stg_value]='154' where stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
 

diff --git a/admin/update/upgrade-mysql.php b/admin/update/upgrade-mysql.php
@@ -699,7 +699,7 @@ function db_upgrade($oldversion) {
     }
     if ($oldversion < 154)
     {
-        modify_database("","ALTER TABLE `prefix_groups` ADD `relevance` text;"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","ALTER TABLE `prefix_groups` ADD `grelevance` text;"); echo $modifyoutput; flush();@ob_flush();
         modify_database("","update `prefix_settings_global` set `stg_value`='154' where stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
 

diff --git a/admin/update/upgrade-postgres.php b/admin/update/upgrade-postgres.php
@@ -423,7 +423,7 @@ function db_upgrade($oldversion) {
     }
     if ($oldversion < 154)
     {
-        modify_database("","ALTER TABLE prefix_groups ADD relevance text;"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","ALTER TABLE prefix_groups ADD grelevance text;"); echo $modifyoutput; flush();@ob_flush();
         modify_database("", "UPDATE prefix_settings_global SET stg_value='154' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }