Skip to content

Commit 76355b4

Browse files
author
Greg Bowler
authored
Allow non-int error codes (#365)
* fix: work with non-integer error codes fixes #364 * ci: upgrade php version * feature: improve error handling of special binding including infiles * feature: improve error handling of special binding including infiles closes #364 * test: improve test oop
1 parent 388b6f7 commit 76355b4

File tree

9 files changed

+59
-42
lines changed

9 files changed

+59
-42
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
php: [ 8.1, 8.2 ]
10+
php: [ 8.2, 8.3 ]
1111

1212
steps:
1313
- uses: actions/checkout@v3
@@ -37,7 +37,7 @@ jobs:
3737
needs: [ composer ]
3838
strategy:
3939
matrix:
40-
php: [ 8.1, 8.2 ]
40+
php: [ 8.2, 8.3 ]
4141

4242
outputs:
4343
coverage: ${{ steps.store-coverage.outputs.coverage_text }}
@@ -90,7 +90,7 @@ jobs:
9090
needs: [ composer ]
9191
strategy:
9292
matrix:
93-
php: [ 8.1, 8.2 ]
93+
php: [ 8.2, 8.3 ]
9494

9595
steps:
9696
- uses: actions/download-artifact@v3
@@ -112,7 +112,7 @@ jobs:
112112
needs: [ composer ]
113113
strategy:
114114
matrix:
115-
php: [ 8.1, 8.2 ]
115+
php: [ 8.2, 8.3 ]
116116

117117
steps:
118118
- uses: actions/download-artifact@v3
@@ -136,7 +136,7 @@ jobs:
136136
needs: [ composer ]
137137
strategy:
138138
matrix:
139-
php: [ 8.1, 8.2 ]
139+
php: [ 8.2, 8.3 ]
140140

141141
steps:
142142
- uses: actions/download-artifact@v3

‎phpunit.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
colors="true"
66
cacheDirectory="test/phpunit/.phpunit.cache"
77
bootstrap="vendor/autoload.php"
8+
displayDetailsOnTestsThatTriggerWarnings="true"
9+
displayDetailsOnTestsThatTriggerDeprecations="true"
10+
displayDetailsOnTestsThatTriggerErrors="true"
11+
displayDetailsOnTestsThatTriggerNotices="true"
812
>
913
<coverage />
1014

‎src/Connection/Driver.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ protected function connect():void {
4545
Connection::ATTR_ERRMODE => Connection::ERRMODE_EXCEPTION,
4646
];
4747

48-
if($this->settings->getSchema() === Settings::DRIVER_MYSQL) {
48+
if($this->settings->getDriver() === Settings::DRIVER_MYSQL) {
4949
$options[Connection::MYSQL_ATTR_INIT_COMMAND]
5050
= "SET SESSION collation_connection='"
5151
. $this->settings->getCollation()
5252
. "'";
53+
$options[Connection::MYSQL_ATTR_LOCAL_INFILE] = true;
5354
}
5455

5556
$this->connection = new Connection(

‎src/Query/SqlQuery.php‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
/** @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */
1313
class SqlQuery extends Query {
1414
const SPECIAL_BINDINGS = [
15-
"limit",
16-
"offset",
17-
"groupBy",
18-
"orderBy",
15+
"field" => ["groupBy", "orderBy"],
16+
"int" => ["limit", "offset"],
17+
"string" => ["infileName"],
1918
];
2019

2120
/** @param array<string, mixed>|array<mixed> $bindings */
@@ -72,8 +71,8 @@ public function execute(array $bindings = []):ResultSet {
7271
}
7372
catch(PDOException $exception) {
7473
throw new PreparedStatementException(
75-
$exception->getMessage(),
76-
$exception->getCode(),
74+
$exception->getMessage() . " (" . $exception->getCode(),
75+
0,
7776
$exception
7877
);
7978
}
@@ -108,24 +107,37 @@ public function injectSpecialBindings(
108107
string $sql,
109108
array $bindings
110109
):string {
111-
foreach(self::SPECIAL_BINDINGS as $special) {
112-
$specialPlaceholder = ":" . $special;
110+
foreach(self::SPECIAL_BINDINGS as $type => $specialList) {
111+
foreach($specialList as $special) {
112+
$specialPlaceholder = ":" . $special;
113113

114-
if(!array_key_exists($special, $bindings)) {
115-
continue;
116-
}
114+
if(!array_key_exists($special, $bindings)) {
115+
continue;
116+
}
117117

118-
$replacement = $this->escapeSpecialBinding(
119-
$bindings[$special],
120-
$special
121-
);
118+
if($type !== "string") {
119+
$replacement = $this->escapeSpecialBinding(
120+
$bindings[$special],
121+
$special
122+
);
123+
}
122124

123-
$sql = str_replace(
124-
$specialPlaceholder,
125-
$replacement,
126-
$sql
127-
);
128-
unset($bindings[$special]);
125+
if($type === "field") {
126+
$words = explode(" ", $bindings[$special]);
127+
$words[0] = "`" . $words[0] . "`";
128+
$replacement = implode(" ", $words);
129+
}
130+
elseif($type === "string") {
131+
$replacement = "'" . $bindings[$special] . "'";
132+
}
133+
134+
$sql = str_replace(
135+
$specialPlaceholder,
136+
$replacement,
137+
$sql
138+
);
139+
unset($bindings[$special]);
140+
}
129141
}
130142

131143
foreach($bindings as $key => $value) {

‎test/phpunit/Connection/DefaultSettingsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ public function testGetDefaultCharset() {
9191
self::assertEquals(DefaultSettings::DEFAULT_COLLATION, $settings->getCollation());
9292
}
9393

94-
public function getDrivers():array {
94+
public static function getDrivers():array {
9595
return [
9696
[Settings::DRIVER_MYSQL, 3306],
9797
[Settings::DRIVER_POSTGRES, 5432],
9898
[Settings::DRIVER_SQLSERVER, 1433],
9999
[Settings::DRIVER_SQLITE, 0],
100100
];
101101
}
102-
}
102+
}

‎test/phpunit/Helper/Helper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private static function queryPathProvider(bool $exists, $extension = "sql") {
8282
return $data;
8383
}
8484

85-
public function queryPathNestedProvider() {
85+
public static function queryPathNestedProvider() {
8686
$data = [];
8787

8888
$n = rand(2, 6);
@@ -163,4 +163,4 @@ private static function queryCollectionPathProvider(
163163

164164
return $data;
165165
}
166-
}
166+
}

‎test/phpunit/Migration/MigratorTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function testCheckFileListOrder(array $fileList) {
108108

109109
/** @dataProvider dataMigrationFileListMissing */
110110
public function testCheckFileListOrderMissing(array $fileList) {
111-
$path = $this->getMigrationDirectory();
111+
$path = self::getMigrationDirectory();
112112
$this->createFiles($fileList, $path);
113113

114114
$settings = $this->createSettings($path);
@@ -542,15 +542,15 @@ public function testMigrationErrorOutputToStream(array $fileList) {
542542
}
543543
}
544544

545-
public function dataMigrationFileList():array {
546-
$fileList = $this->generateFileList();
545+
public static function dataMigrationFileList():array {
546+
$fileList = self::generateFileList();
547547
return [
548548
[$fileList]
549549
];
550550
}
551551

552-
public function dataMigrationFileListMissing():array {
553-
$fileList = $this->generateFileList(
552+
public static function dataMigrationFileListMissing():array {
553+
$fileList = self::generateFileList(
554554
true,
555555
false
556556
);
@@ -559,8 +559,8 @@ public function dataMigrationFileListMissing():array {
559559
];
560560
}
561561

562-
public function dataMigrationFileListDuplicate():array {
563-
$fileList = $this->generateFileList(
562+
public static function dataMigrationFileListDuplicate():array {
563+
$fileList = self::generateFileList(
564564
false,
565565
true
566566
);
@@ -638,7 +638,7 @@ protected function hashMigrationToDb(
638638
}
639639
}
640640

641-
private function generateFileList($missingFiles = false, $duplicateFiles = false) {
641+
private static function generateFileList($missingFiles = false, $duplicateFiles = false) {
642642
$fileList = [];
643643

644644
$migLength = rand(10, 30);

‎test/phpunit/Query/SqlQueryTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public function testSpecialBindingsNoAscDesc(
238238
self::assertStringNotContainsString(":limit", $injectedSql);
239239
self::assertStringNotContainsString(":offset", $injectedSql);
240240

241-
self::assertStringContainsString("order by sortColumn", $injectedSql);
241+
self::assertStringContainsString("order by `sortColumn`", $injectedSql);
242242
self::assertStringContainsString("limit 100", $injectedSql);
243243
self::assertStringContainsString("offset 25", $injectedSql);
244244
}
@@ -260,7 +260,7 @@ public function testSpecialBindingsAscDesc(
260260
"offset" => 25,
261261
]);
262262

263-
self::assertStringContainsString("order by sortColumn desc", $injectedSql);
263+
self::assertStringContainsString("order by `sortColumn` desc", $injectedSql);
264264
}
265265

266266
/**

‎test/phpunit/Result/RowTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function testGetIntNullable() {
123123
self::assertNull($row->getInt("does_not_exist"));
124124
}
125125

126-
public function data_getTestRow():array {
126+
public static function data_getTestRow():array {
127127
$data = [];
128128

129129
$columns = ["id", "name", "example", "exampleFloat", "exampleDateTime", "exampleBool"];

0 commit comments

Comments
 (0)