Data import now support dbprefix

ronisaha · ronisaha · commit 6fce356b91ca · 2013-10-29T08:58:31.000+06:00
diff --git a/src/libs/Xiidea/Installer/Services/DataBase.php b/src/libs/Xiidea/Installer/Services/DataBase.php
@@ -104,10 +104,24 @@ public function parseMysqlDump($url)
                 continue;
             }
 
-            mysql_query($query) or $error[] = mysql_error();
+            mysql_query($this->addTablePrefix($query)) or $error[] = mysql_error();
         }
     }
 
+    private function addTablePrefix($query)
+    {
+        if (empty(self::$config['dbprefix'])) {
+            return $query;
+        }
+
+        return preg_replace(
+            '/(insert  into|for the table|for table|CREATE TABLE|DROP TABLE IF EXISTS) `([\w]+)`/',
+            '${1} `' . self::$config['dbprefix'] .'${2}`',
+            $query
+        );
+
+    }
+
     function splitQueryText($query)
     {
         // the regex needs a trailing semicolon

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,24 @@ public function parseMysqlDump($url)`
`104`	`104`	`continue;`
`105`	`105`	`}`
`106`	`106`
`107`		`- mysql_query($query) or $error[] = mysql_error();`
	`107`	`+ mysql_query($this->addTablePrefix($query)) or $error[] = mysql_error();`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ private function addTablePrefix($query)`
	`112`	`+ {`
	`113`	`+ if (empty(self::$config['dbprefix'])) {`
	`114`	`+ return $query;`
	`115`	`+ }`
	`116`	`+`
	`117`	`+ return preg_replace(`
	`118`	+ '/(insert into\|for the table\|for table\|CREATE TABLE\|DROP TABLE IF EXISTS) `([\w]+)`/',
	`119`	+ '${1} `' . self::$config['dbprefix'] .'${2}`',
	`120`	`+ $query`
	`121`	`+ );`
	`122`	`+`
	`123`	`+ }`
	`124`	`+`
`111`	`125`	`function splitQueryText($query)`
`112`	`126`	`{`
`113`	`127`	`// the regex needs a trailing semicolon`