Merge pull request #1094 from takeit/bug

fixed bugs related to playlists
sourcefabric · Apr 16, 2015 · 860e4bd · 860e4bd
2 parents 70e7193 + 9f919b1
commit 860e4bd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/data-required.sql
@@ -0,0 +1,2 @@
+ALTER TABLE  `playlist` CHANGE  `notes` `notes` VARCHAR( 1024 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;
+ALTER TABLE  `playlist` CHANGE  `max_items` `max_items` INT( 11 ) NULL;
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/playlist.php b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/playlist.php
@@ -0,0 +1,35 @@
+<?php
+
+$newscoopDir = realpath(dirname(__FILE__).'/../../../../../../').'/';
+
+require_once $newscoopDir.'vendor/autoload.php';
+require $newscoopDir.'conf/database_conf.php';
+
+use Monolog\Logger;
+
+$upgradeErrors = array();
+$app = new Silex\Application();
+$app->register(new Silex\Provider\MonologServiceProvider(), array(
+    'monolog.logfile' => $newscoopDir.'log/upgrade.log',
+    'monolog.level' => Logger::NOTICE,
+    'monolog.name' => 'upgrade',
+));
+
+$logger = $app['monolog'];
+
+$app->register(new Silex\Provider\DoctrineServiceProvider(), array(
+    'db.options' => array(
+        'driver'    => 'pdo_mysql',
+        'host'      => $Campsite['db']['host'],
+        'dbname'    => $Campsite['db']['name'],
+        'user'      => $Campsite['db']['user'],
+        'password'  => $Campsite['db']['pass'],
+        'port'      => $Campsite['db']['port'],
+        'charset'   => 'utf8',
+    ),
+));
+
+try {
+    $app['db']->query('ALTER TABLE playlist ADD themes VARCHAR(255) DEFAULT NULL');
+} catch (\Exception $e) {
+}
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/tables.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.04.16/tables.sql
@@ -0,0 +1 @@
+system php ./playlist.php
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE `playlist` CHANGE `notes` `notes` VARCHAR( 1024 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;
		ALTER TABLE `playlist` CHANGE `max_items` `max_items` INT( 11 ) NULL;