CS-5714 - Restore of backup is not working from 4.3.2 to 4.4.0 RC

sourcefabric · Mar 11, 2015 · 379b8f0 · 379b8f0
1 parent a060634
commit 379b8f0
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 2,849 deletions.
diff --git a/newscoop/install/Resources/sql/campsite_core.sql b/newscoop/install/Resources/sql/campsite_core.sql
@@ -3356,16 +3356,18 @@ CREATE TABLE Snippets (
 DROP TABLE IF EXISTS `SnippetTemplates`;
 
 CREATE TABLE SnippetTemplates (
-  Id INT AUTO_INCREMENT NOT NULL,
-  Name VARCHAR(255) NOT NULL,
-  Controller VARCHAR(255) NOT NULL,
-  Parameters LONGTEXT NOT NULL,
-  Template LONGTEXT NOT NULL,
-  Favourite TINYINT(1) NOT NULL,
-  IconInactive LONGTEXT NOT NULL,
-  IconActive LONGTEXT NOT NULL,
-  PRIMARY KEY(Id)
-) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `Controller` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `TemplateCode` longtext COLLATE utf8_unicode_ci NOT NULL,
+  `Favourite` tinyint(1) DEFAULT NULL,
+  `Enabled` tinyint(1) NOT NULL,
+  `IconInactive` longtext COLLATE utf8_unicode_ci,
+  `IconActive` longtext COLLATE utf8_unicode_ci,
+  `Created` datetime NOT NULL,
+  `Modified` datetime NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 ALTER TABLE Snippets ADD CONSTRAINT SnippetTemplate FOREIGN KEY (TemplateId) REFERENCES SnippetTemplates (Id);
 
@@ -3389,7 +3391,9 @@ CREATE TABLE user_oauth_clients (
   PRIMARY KEY(user_id, client_id)
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 
-CREATE TABLE IF NOT EXISTS `cron_jobs` (
+DROP TABLE IF EXISTS `cron_jobs`;
+
+CREATE TABLE `cron_jobs` (
   `id` int AUTO_INCREMENT NOT NULL,
   `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `command` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
@@ -3422,7 +3426,7 @@ CREATE TABLE `community_ticker_event` (
 
 DROP TABLE IF EXISTS `editorial_comments`;
 
-CREATE TABLE IF NOT EXISTS `editorial_comments` (
+CREATE TABLE `editorial_comments` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `fk_article_number` int(11) NOT NULL,
   `fk_language_id` int(11) NOT NULL,