Skip to content
This repository was archived by the owner on Feb 20, 2024. It is now read-only.

Commit d4eac60

Browse files
committed
Merge pull request #80 from tim96/fix-windows-suffix
Change suffix in auth parameters to keep windows compatibility.
2 parents d90b45b + 918a256 commit d4eac60

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

Database/MySQL.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct($params, $basePath)
5858
$this->auth = sprintf('-u%s', $params['db_user']);
5959

6060
if ($params['db_password']) {
61-
$this->auth = sprintf("--host='%s' --port='%d' --user='%s' --password='%s'", $params['db_host'], $params['db_port'], $params['db_user'], $params['db_password']);
61+
$this->auth = sprintf("--host=\"%s\" --port=\"%d\" --user=\"%s\" --password=\"%s\"", $params['db_host'], $params['db_port'], $params['db_user'], $params['db_password']);
6262
}
6363
}
6464
}

Tests/Database/MySQLTest.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function shouldDumpAllDatabases()
2525
),
2626
), '/var/backup/');
2727

28-
$this->assertEquals($mysql->getCommand(), "mysqldump --host='localhost' --port='3306' --user='root' --password='test' --all-databases > /var/backup/mysql/all-databases.sql");
28+
$this->assertEquals($mysql->getCommand(), "mysqldump --host=\"localhost\" --port=\"3306\" --user=\"root\" --password=\"test\" --all-databases > /var/backup/mysql/all-databases.sql");
2929
}
3030

3131
/**
@@ -43,7 +43,7 @@ public function shouldDumpSpecifiedDatabase()
4343
'db_password' => 'test',
4444
),
4545
), '/var/backup/');
46-
46+
4747
$mysql2 = new MySQLDummy(array(
4848
'mysql' => array(
4949
'all_databases' => false,
@@ -55,15 +55,9 @@ public function shouldDumpSpecifiedDatabase()
5555
),
5656
), '/var/backup/');
5757

58-
$this->assertEquals($mysql1->getCommand(), "mysqldump --host='localhost' --port='3306' --user='root' --password='test' dizbdd > /var/backup/mysql/dizbdd.sql");
59-
$this->assertEquals($mysql2->getCommand(), "mysqldump --host='somehost' --port='2222' --user='mysql' --password='somepwd' somebdd > /var/backup/mysql/somebdd.sql");
60-
}
58+
$this->assertEquals($mysql1->getCommand(), "mysqldump --host=\"localhost\" --port=\"3306\" --user=\"root\" --password=\"test\" dizbdd > /var/backup/mysql/dizbdd.sql");
59+
$this->assertEquals($mysql2->getCommand(), "mysqldump --host=\"somehost\" --port=\"2222\" --user=\"mysql\" --password=\"somepwd\" somebdd > /var/backup/mysql/somebdd.sql");
6160

62-
/**
63-
* @test
64-
*/
65-
public function shouldDumpSpecifiedDatabaseWithNoAuth()
66-
{
6761
// dump specified database with no auth
6862
$mysql = new MySQLDummy(array(
6963
'mysql' => array(
@@ -116,7 +110,7 @@ public function shouldIgnoreSpecifiedTablesForSpecifiedDatabase()
116110
),
117111
), '/var/backup/');
118112

119-
$this->assertEquals($mysql->getCommand(), "mysqldump --host='localhost' --port='3306' --user='root' --password='test' dizbdd --ignore-table=dizbdd.table1 --ignore-table=dizbdd.table2 > /var/backup/mysql/dizbdd.sql");
113+
$this->assertEquals($mysql->getCommand(), "mysqldump --host=\"localhost\" --port=\"3306\" --user=\"root\" --password=\"test\" dizbdd --ignore-table=dizbdd.table1 --ignore-table=dizbdd.table2 > /var/backup/mysql/dizbdd.sql");
120114
}
121115

122116
/**
@@ -136,7 +130,7 @@ public function shouldIgnoreSpecifiedTablesForAllDatabase()
136130
),
137131
), '/var/backup/');
138132

139-
$this->assertEquals($mysql->getCommand(), "mysqldump --host='localhost' --port='3306' --user='root' --password='test' --all-databases --ignore-table=db1.table1 --ignore-table=db2.table2 > /var/backup/mysql/all-databases.sql");
133+
$this->assertEquals($mysql->getCommand(), "mysqldump --host=\"localhost\" --port=\"3306\" --user=\"root\" --password=\"test\" --all-databases --ignore-table=db1.table1 --ignore-table=db2.table2 > /var/backup/mysql/all-databases.sql");
140134
}
141135

142136
/**

0 commit comments

Comments
 (0)