[Pkg-owncloud-commits] [php-sabredav] 34/80: Fix errors when running migration with MySQL

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 496fca1596449348c32f24524f3e14f61948bb94
Author: Peter Geer <pageer at skepticats.com>
Date:   Sat Jan 2 21:35:41 2016 -0500

    Fix errors when running migration with MySQL
    
    This fixes two errors that cause the migration to throw an exception and fail.  The first is a case fall-through that causes the SQLite case to be executed as well and the second is a syntax error in a query.
---
 bin/migrateto20.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/migrateto20.php b/bin/migrateto20.php
index bcec1cf..3118104 100755
--- a/bin/migrateto20.php
+++ b/bin/migrateto20.php
@@ -133,6 +133,7 @@ foreach(['calendar', 'addressbook'] as $itemType) {
                         ");
                         break;
                 }
+                break;
 
             case 'sqlite' :
 
@@ -170,6 +171,7 @@ foreach(['calendar', 'addressbook'] as $itemType) {
 
                         break;
                 }
+                break;
 
         }
         echo "Creation of 2.0 $tableName table is complete\n";
@@ -393,7 +395,7 @@ CREATE TABLE cards (
     uri VARCHAR(200),
     lastmodified INT(11) UNSIGNED,
     etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL,
+    size INT(11) UNSIGNED NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
             ");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git