Skip to content

Commit

Permalink
Dev: Database additions for working surveymenu edition
Browse files Browse the repository at this point in the history
  • Loading branch information
@lacrioque
lacrioque committed Jul 25, 2017
1 parent c030159 commit d75c38a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -13,7 +13,7 @@

$config['versionnumber'] = '3.0.0-beta.1'; //The current version of this branch
$config['masterversion'] = '2.62.2'; //The current masters version merged into this branch
$config['dbversionnumber'] = 307;
$config['dbversionnumber'] = 308;
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['assetsversionnumber'] = '2900';
Expand Down
24 changes: 13 additions & 11 deletions application/helpers/update/updatedb_helper.php
View file
Expand Up @@ -298,27 +298,19 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
$oTransaction->commit();
$oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>305),"stg_name='DBVersion'");
}
/**
* Change dbfieldnames to be more functional
*/
if ($iOldDBVersion < 306) {
$oTransaction = $oDB->beginTransaction();
$oDB->createCommand()->renameColumn('{{surveymenu_entries}}','order','ordering');
$oDB->createCommand()->renameColumn('{{surveymenu}}','order','ordering');
$oTransaction->commit();
$oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>306),"stg_name='DBVersion'");
}

/**
* Template tables
* @since 2017-07-12
*/
if ($iOldDBVersion < 306) {
$oTransaction = $oDB->beginTransaction();
$oDB->createCommand()->renameColumn('{{surveymenu_entries}}','order','ordering');
$oDB->createCommand()->renameColumn('{{surveymenu}}','order','ordering');
createSurveyGroupTables306($oDB);
$oTransaction->commit();
$oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>306),"stg_name='DBVersion'");
}
}

/**
* User settings table
Expand All @@ -342,6 +334,16 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
$oTransaction->commit();
}

/*
* Change dbfieldnames to be more functional
*/
if ($iOldDBVersion < 308) {
$oTransaction = $oDB->beginTransaction();
$oDB->createCommand()->renameColumn('{{surveymenu_entries}}','order','ordering');
$oDB->createCommand()->renameColumn('{{surveymenu}}','order','ordering');
$oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>308),"stg_name='DBVersion'");
$oTransaction->commit();
}

}
catch(Exception $e)
Expand Down
8 changes: 4 additions & 4 deletions installer/sql/create-mssql.sql
View file
Expand Up @@ -630,7 +630,7 @@ CREATE TABLE prefix_surveymenu (
[parent_id] int(11) DEFAULT NULL,
[survey_id] int(11) DEFAULT NULL,
[user_id] int(11) DEFAULT NULL,
[order] int(11) DEFAULT '0',
[ordering] int(11) DEFAULT '0',
[level] int(11) DEFAULT '0',
[title] VARCHAR(255) NOT NULL DEFAULT '',
[position] VARCHAR(255) NOT NULL DEFAULT 'side',
Expand All @@ -644,7 +644,7 @@ CREATE TABLE prefix_surveymenu (

create index [parent_id_index] on [prefix_surveymenu] ([parent_id]);
create index [user_id_index] on [prefix_surveymenu] ([user_id]);
create index [order_index] on [prefix_surveymenu] ([order]);
create index [order_index] on [prefix_surveymenu] ([ordering]);
create index [title_index] on [prefix_surveymenu] ([title]);


Expand All @@ -655,7 +655,7 @@ CREATE TABLE prefix_surveymenu_entries (
[id] int(11) NOT NULL ,
[menu_id] int(11) DEFAULT NULL,
[user_id] int(11) DEFAULT NULL,
[order] int(11) DEFAULT '0',
[ordering] int(11) DEFAULT '0',
[name] VARCHAR(255) NOT NULL DEFAULT '',
[title] VARCHAR(255) NOT NULL DEFAULT '',
[menu_title] VARCHAR(255) NOT NULL DEFAULT '',
Expand All @@ -681,7 +681,7 @@ CREATE TABLE prefix_surveymenu_entries (
FOREIGN KEY ([menu_id]) REFERENCES prefix_surveymenu ([id]) ON DELETE CASCADE
);

create index [order_index] on [prefix_surveymenu] ([order]);
create index [order_index] on [prefix_surveymenu] ([ordering]);
create index [user_index] on [prefix_surveymenu] ([user]);
create index [title_index] on [prefix_surveymenu] ([title]);
create index [menu_title_index] on [prefix_surveymenu] ([menu_title]);
Expand Down
4 changes: 2 additions & 2 deletions installer/sql/create-mysql.sql
View file
Expand Up @@ -647,7 +647,7 @@ CREATE TABLE `prefix_surveymenu_entries` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`menu_id` int(11) DEFAULT NULL,
`user_id` int(11) DEFAULT NULL,
`order` int(11) DEFAULT '0',
`ordering` int(11) DEFAULT '0',
`name` varchar(255) NOT NULL DEFAULT '',
`title` varchar(255) NOT NULL DEFAULT '',
`menu_title` varchar(255) NOT NULL DEFAULT '',
Expand All @@ -671,7 +671,7 @@ CREATE TABLE `prefix_surveymenu_entries` (
`created_by` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `menu_id` (`menu_id`),
KEY `order` (`order`),
KEY `ordering` (`ordering`),
KEY `title` (`title`(191)),
KEY `menu_title` (`menu_title`(191))
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
Expand Down
8 changes: 4 additions & 4 deletions installer/sql/create-pgsql.sql
View file
Expand Up @@ -629,7 +629,7 @@ CREATE TABLE prefix_surveymenu (
"parent_id" integer DEFAULT NULL,
"survey_id" integer DEFAULT NULL,
"user_id" integer DEFAULT NULL,
"order" integer DEFAULT '0',
"ordering" integer DEFAULT '0',
"level" integer DEFAULT '0',
"title" character varying(255) NOT NULL DEFAULT '',
"position" character varying(255) NOT NULL DEFAULT 'side',
Expand All @@ -643,7 +643,7 @@ CREATE TABLE prefix_surveymenu (

create index menu_parent_id_index on prefix_surveymenu (parent_id);
create index menu_user_id_index on prefix_surveymenu (user_id);
create index menu_order_index on prefix_surveymenu ("order");
create index menu_order_index on prefix_surveymenu ("ordering");
create index menu_title_index on prefix_surveymenu (title);


Expand All @@ -654,7 +654,7 @@ CREATE TABLE prefix_surveymenu_entries (
"id" integer NOT NULL ,
"menu_id" integer DEFAULT NULL,
"user_id" integer DEFAULT NULL,
"order" integer DEFAULT '0',
"ordering" integer DEFAULT '0',
"name" character varying(255) NOT NULL DEFAULT '',
"title" character varying(255) NOT NULL DEFAULT '',
"menu_title" character varying(255) NOT NULL DEFAULT '',
Expand All @@ -680,7 +680,7 @@ CREATE TABLE prefix_surveymenu_entries (
FOREIGN KEY (menu_id) REFERENCES prefix_surveymenu (id) ON DELETE CASCADE
);

create index entry_order_index on prefix_surveymenu_entries ("order");
create index entry_order_index on prefix_surveymenu_entries ("ordering");
create index entry_user_index on prefix_surveymenu_entries ("user_id");
create index entry_title_index on prefix_surveymenu_entries (title);
create index entry_menu_title_index on prefix_surveymenu_entries (menu_title);
Expand Down

0 comments on commit d75c38a

Please sign in to comment.