[geeklog-cvs] geeklog: Fixed auto-detection of table prefix during migration w...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/3013cca2bd66
changeset: 7164:3013cca2bd66
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jul 04 17:27:14 2009 +0200
description:
Fixed auto-detection of table prefix during migration when the SQL dump contained CREATE TABLE IF NOT EXISTS requests (bug #0000922)

diffstat:

 public_html/admin/install/migrate.php |  1 +
 public_html/docs/history              |  2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 23c373e2f87b -r 3013cca2bd66 public_html/admin/install/migrate.php
--- a/public_html/admin/install/migrate.php	Sat Jul 04 16:35:45 2009 +0200
+++ b/public_html/admin/install/migrate.php	Sat Jul 04 17:27:14 2009 +0200
@@ -614,6 +614,7 @@
                         $num_create++;
                         $line = trim($line);
                         if (strpos($line, 'access') !== false) {
+                            $line = str_replace('IF NOT EXISTS ', '', $line);
                             $words = explode(' ', $line);
                             if (count($words) >= 3) {
                                 $table = str_replace('`', '', $words[2]);
diff -r 23c373e2f87b -r 3013cca2bd66 public_html/docs/history
--- a/public_html/docs/history	Sat Jul 04 16:35:45 2009 +0200
+++ b/public_html/docs/history	Sat Jul 04 17:27:14 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Changes since 1.6.0rc1:
+- Fixed auto-detection of table prefix during migration when the SQL dump
+  contained CREATE TABLE IF NOT EXISTS requests (bug #0000922) [Dirk]
 - When an error occurs in bigdump.php (during migration) send the user back to
   migrate.php (bug #0000919) [Dirk]
 - Fixed warning in migration script when no backups are available (bug #0000918,