From da4105ff464ff4a937c86c147665f1449f253824 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 5 Dec 2011 20:55:58 +0000 Subject: [PATCH] New Feature #05269: Use ExpressionManager for Branching logic as optional 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 --- admin/install/create-mssql.sql | 2 +- admin/install/create-mssqlnative.sql | 2 +- admin/install/create-mysql.sql | 2 +- admin/install/create-postgres.sql | 2 +- admin/update/upgrade-mssql.php | 2 +- admin/update/upgrade-mssqlnative.php | 2 +- admin/update/upgrade-mysql.php | 2 +- admin/update/upgrade-postgres.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/install/create-mssql.sql b/admin/install/create-mssql.sql index 8a9ceeb0714..6d7baf79c70 100644 --- 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 index 44cb0da6ac0..f043348ac7e 100644 --- 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 index 8b9bb6c5859..989394338ae 100644 --- 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 index 9337ee82e1d..207e19c4f30 100644 --- 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 index 2c34196fa11..cee6e728e13 100644 --- 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 '

'.sprintf($clang->gT('Database update finished (%s)'),date('Y-m-d H:i:s')).'
'; diff --git a/admin/update/upgrade-mssqlnative.php b/admin/update/upgrade-mssqlnative.php index bb5c902bfae..1ae8fef47b5 100644 --- 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 index 8984da7660b..2124ab2f8e4 100644 --- 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 index 0f6ace4df2e..7888061ee74 100644 --- 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(); }