Merge branch 'release/0.11.2'

pagekit · Apr 7, 2016 · a83d212 · a83d212
2 parents 51a9d75 + 90177a8
commit a83d212
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.11.2 (April 7, 2016)
+
+### FIXED
+- Fixed update URL after comment
+- Fixed different prefixes with SQLLite
+- Fixed SQLite collations
+
 ## 0.11.1 (April 1, 2016)
 
 ### Changed

diff --git a/app/views/comments.js b/app/views/comments.js
@@ -162,7 +162,7 @@ module.exports = {
 
                         } else {
 
-                            this.$root.load().success(function () {
+                            this.$root.load().then(function () {
                                 window.location.hash = 'comment-' + data.comment.id;
                             });
                         }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pagekit/blog",
     "type": "pagekit-extension",
-    "version": "0.11.1",
+    "version": "0.11.2",
     "title": "Blog",
     "description": "A blog extensions with a built-in comment system.",
     "license": "MIT",

diff --git a/scripts.php b/scripts.php
@@ -22,10 +22,10 @@
                 $table->addColumn('data', 'json_array', ['notnull' => false]);
                 $table->addColumn('roles', 'simple_array', ['notnull' => false]);
                 $table->setPrimaryKey(['id']);
-                $table->addUniqueIndex(['slug'], 'BLOG_POST_SLUG');
-                $table->addIndex(['title'], 'BLOG_POST_TITLE');
-                $table->addIndex(['user_id'], 'BLOG_POST_USER_ID');
-                $table->addIndex(['date'], 'BLOG_POST_DATE');
+                $table->addUniqueIndex(['slug'], '@BLOG_POST_SLUG');
+                $table->addIndex(['title'], '@BLOG_POST_TITLE');
+                $table->addIndex(['user_id'], '@BLOG_POST_USER_ID');
+                $table->addIndex(['date'], '@BLOG_POST_DATE');
             });
         }
 
@@ -43,11 +43,11 @@
                 $table->addColumn('content', 'text');
                 $table->addColumn('status', 'smallint');
                 $table->setPrimaryKey(['id']);
-                $table->addIndex(['author'], 'BLOG_COMMENT_AUTHOR');
-                $table->addIndex(['created'], 'BLOG_COMMENT_CREATED');
-                $table->addIndex(['status'], 'BLOG_COMMENT_STATUS');
-                $table->addIndex(['post_id'], 'BLOG_COMMENT_POST_ID');
-                $table->addIndex(['post_id', 'status'], 'BLOG_COMMENT_POST_ID_STATUS');
+                $table->addIndex(['author'], '@BLOG_COMMENT_AUTHOR');
+                $table->addIndex(['created'], '@BLOG_COMMENT_CREATED');
+                $table->addIndex(['status'], '@BLOG_COMMENT_STATUS');
+                $table->addIndex(['post_id'], '@BLOG_COMMENT_POST_ID');
+                $table->addIndex(['post_id', 'status'], '@BLOG_COMMENT_POST_ID_STATUS');
             });
         }
 
@@ -64,6 +64,36 @@
         if ($util->tableExists('@blog_comment')) {
             $util->dropTable('@blog_comment');
         }
-    }
+    },
+
+    'updates' => [
+
+        '0.11.2' => function ($app) {
+
+            $db = $app['db'];
+            $util = $db->getUtility();
+
+            foreach (['@blog_post', '@blog_comment'] as $name) {
+                $table = $util->getTable($name);
+
+                foreach ($table->getIndexes() as $name => $index) {
+                    if ($name !== 'primary') {
+                        $table->renameIndex($index->getName(), $app['db']->getPrefix() . $index->getName());
+                    }
+                }
+
+                if ($app['db']->getDatabasePlatform()->getName() === 'sqlite') {
+                    foreach ($table->getColumns() as $column) {
+                        if (in_array($column->getType()->getName(), ['string', 'text'])) {
+                            $column->setOptions(['customSchemaOptions' => ['collation' => 'NOCASE']]);
+                        }
+                    }
+                }
+            }
+
+            $util->migrate();
+        }
+
+    ]
 
 ];