mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Removed hard-coded SQL database creation

Browse Source
This commit is contained in:
Nick Liu
2019-12-23 15:28:52 +01:00
parent f38e6c1f6d
commit 2330f8a152
2 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
e107_tests/tests/unit/e_db_mysqlTest.php
View File

@@ -961,9 +961,9 @@
/** /**
* @desc Test primary methods against a secondary database (ensures mysqlPrefix is working correctly) * @desc Test primary methods against a secondary database instance (ensures mysqlPrefix is working correctly)
*/ */
public function testSecondaryDatabase() public function testSecondaryDatabaseInstance()
{ {
try try
@@ -980,41 +980,29 @@
$config = e107::getMySQLConfig(); $config = e107::getMySQLConfig();
// $xql = $this->db; $database = $config['mySQLdefaultdb'];
$database = 'e107_tests_tmp';
$table = 'test'; $table = 'test';
$MPREFIX = 'another_prefix_';
// cleanup
$xql->gen("DROP DATABASE `".$database."`");
// create database
if($xql->gen("CREATE DATABASE ".$database." CHARACTER SET `utf8`"))
{
$xql->gen("GRANT ALL ON `".$database."`.* TO ".$config['mySQLuser']."@'".$config['mySQLserver']."';");
$xql->gen("FLUSH PRIVILEGES;");
}
else
{
$this->fail("Failed to create secondary database");
}
// use new database // use new database
$use = $xql->database($database,MPREFIX,true); $use = $xql->database($database,$MPREFIX,true);
if($use === false) if($use === false)
{ {
$this->fail("Failed to select new database"); $this->fail("Failed to select new database");
} }
$create = "CREATE TABLE `".$database."`.".MPREFIX.$table." ( $create = "CREATE TABLE `".$database."`.".$MPREFIX.$table." (
`test_id` int(4) NOT NULL AUTO_INCREMENT, `test_id` int(4) NOT NULL AUTO_INCREMENT,
`test_var` varchar(255) NOT NULL, `test_var` varchar(255) NOT NULL,
PRIMARY KEY (`test_id`) PRIMARY KEY (`test_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
"; ";
// create secondary database // cleanup
$xql->gen("DROP TABLE IF EXISTS `$database`.{$MPREFIX}{$table}");
// create table
if(!$xql->gen($create)) if(!$xql->gen($create))
{ {
$this->fail("Failed to create table in secondary database"); $this->fail("Failed to create table in secondary database");

33
e107_tests/tests/unit/e_db_pdoTest.php
View File

@@ -1150,9 +1150,9 @@
/** /**
* @desc Test primary methods against a secondary database (ensures mysqlPrefix is working correctly) * @desc Test primary methods against a secondary database instance (ensures mysqlPrefix is working correctly)
*/ */
public function testSecondaryDatabase() public function testSecondaryDatabaseInstance()
{ {
try try
@@ -1168,42 +1168,29 @@
$config = e107::getMySQLConfig(); $config = e107::getMySQLConfig();
// $xql = $this->db; $database = $config['mySQLdefaultdb'];
$database = 'e107_tests_tmp';
$table = 'test'; $table = 'test';
$MPREFIX = 'another_prefix_';
// cleanup
$xql->gen("DROP DATABASE `".$database."`");
// create database
if($xql->gen("CREATE DATABASE ".$database." CHARACTER SET `utf8`"))
{
$xql->gen("GRANT ALL ON `".$database."`.* TO ".$config['mySQLuser']."@'".$config['mySQLserver']."';");
$xql->gen("FLUSH PRIVILEGES;");
}
else
{
$this->fail("Failed to create secondary database");
}
// use new database // use new database
$use = $xql->database($database,MPREFIX,true); $use = $xql->database($database,$MPREFIX,true);
if($use === false) if($use === false)
{ {
$this->fail("Failed to select new database"); $this->fail("Failed to select new database");
} }
$create = "CREATE TABLE `".$database."`.".MPREFIX.$table." ( $create = "CREATE TABLE `".$database."`.".$MPREFIX.$table." (
`test_id` int(4) NOT NULL AUTO_INCREMENT, `test_id` int(4) NOT NULL AUTO_INCREMENT,
`test_var` varchar(255) NOT NULL, `test_var` varchar(255) NOT NULL,
PRIMARY KEY (`test_id`) PRIMARY KEY (`test_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
"; ";
// create secondary database // cleanup
$xql->gen("DROP TABLE IF EXISTS `$database`.{$MPREFIX}{$table}");
// create table
if(!$xql->gen($create)) if(!$xql->gen($create))
{ {
$this->fail("Failed to create table in secondary database"); $this->fail("Failed to create table in secondary database");