pass connection to MySqlGrammar

lucabecchetti · lucabecchetti · commit 8aafd9a10cae · 2025-10-17T14:14:34.000+02:00
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -1 +1 @@
-{"version":1,"defects":{"SchemaTest::testDropPartition":3,"SchemaTest::testDropPartitions":5,"SchemaTest::testAnalyzePartition":5,"SchemaTest::testAnalyzePartitions":5,"SchemaTest::testRepairPartition":5,"SchemaTest::testRepairPartitions":5,"SchemaTest::testRebuildPartition":5,"SchemaTest::testRebuildPartitions":5,"SchemaTest::testCheckPartition":5,"SchemaTest::testCheckPartitions":5,"SchemaTest::testOptimizePartition":5,"SchemaTest::testOptimizePartitions":5,"SchemaTest::testTruncatePartition":5,"SchemaTest::testTruncatePartitions":5,"SchemaTest::testPartitionByKey":5,"SchemaTest::testPartitionByHash":5,"SchemaTest::testPartitionByRange":5,"SchemaTest::testPartitionByRangeExcludeFuture":5,"SchemaTest::testPartitionByList":5,"SchemaTest::testPartitionByOneYears":5,"SchemaTest::testPartitionByYears":5,"SchemaTest::testPartitionByYearsAndMonths":5,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":5,"MysqlConnectionTest::testGetQueryBuilder":4},"times":{"MysqlConnectionTest::testGetQueryBuilder":0.005,"SchemaTest::testDropPartition":0.004,"SchemaTest::testDropPartitions":0,"SchemaTest::testAnalyzePartition":0.001,"SchemaTest::testAnalyzePartitions":0,"SchemaTest::testRepairPartition":0,"SchemaTest::testRepairPartitions":0,"SchemaTest::testRebuildPartition":0,"SchemaTest::testRebuildPartitions":0,"SchemaTest::testCheckPartition":0,"SchemaTest::testCheckPartitions":0,"SchemaTest::testOptimizePartition":0,"SchemaTest::testOptimizePartitions":0,"SchemaTest::testTruncatePartition":0,"SchemaTest::testTruncatePartitions":0,"SchemaTest::testPartitionByKey":0,"SchemaTest::testPartitionByHash":0,"SchemaTest::testPartitionByRange":0.002,"SchemaTest::testPartitionByRangeExcludeFuture":0,"SchemaTest::testPartitionByList":0,"SchemaTest::testPartitionByOneYears":0,"SchemaTest::testPartitionByYears":0,"SchemaTest::testPartitionByYearsAndMonths":0,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":0}}
+{"version":1,"defects":{"SchemaTest::testDropPartition":3,"SchemaTest::testDropPartitions":5,"SchemaTest::testAnalyzePartition":5,"SchemaTest::testAnalyzePartitions":5,"SchemaTest::testRepairPartition":5,"SchemaTest::testRepairPartitions":5,"SchemaTest::testRebuildPartition":5,"SchemaTest::testRebuildPartitions":5,"SchemaTest::testCheckPartition":5,"SchemaTest::testCheckPartitions":5,"SchemaTest::testOptimizePartition":5,"SchemaTest::testOptimizePartitions":5,"SchemaTest::testTruncatePartition":5,"SchemaTest::testTruncatePartitions":5,"SchemaTest::testPartitionByKey":5,"SchemaTest::testPartitionByHash":5,"SchemaTest::testPartitionByRange":5,"SchemaTest::testPartitionByRangeExcludeFuture":5,"SchemaTest::testPartitionByList":5,"SchemaTest::testPartitionByOneYears":5,"SchemaTest::testPartitionByYears":5,"SchemaTest::testPartitionByYearsAndMonths":5,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":5,"MysqlConnectionTest::testGetQueryBuilder":4},"times":{"MysqlConnectionTest::testGetQueryBuilder":0.008,"SchemaTest::testDropPartition":0.007,"SchemaTest::testDropPartitions":0,"SchemaTest::testAnalyzePartition":0.002,"SchemaTest::testAnalyzePartitions":0,"SchemaTest::testRepairPartition":0,"SchemaTest::testRepairPartitions":0,"SchemaTest::testRebuildPartition":0,"SchemaTest::testRebuildPartitions":0,"SchemaTest::testCheckPartition":0,"SchemaTest::testCheckPartitions":0,"SchemaTest::testOptimizePartition":0,"SchemaTest::testOptimizePartitions":0,"SchemaTest::testTruncatePartition":0,"SchemaTest::testTruncatePartitions":0,"SchemaTest::testPartitionByKey":0,"SchemaTest::testPartitionByHash":0,"SchemaTest::testPartitionByRange":0.004,"SchemaTest::testPartitionByRangeExcludeFuture":0,"SchemaTest::testPartitionByList":0,"SchemaTest::testPartitionByOneYears":0,"SchemaTest::testPartitionByYears":0,"SchemaTest::testPartitionByYearsAndMonths":0,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":0}}
diff --git a/src/Schema/Schema.php b/src/Schema/Schema.php
@@ -49,7 +49,7 @@ public static function getPartitionNames($db, $table)
             . " WHERE `TABLE_SCHEMA` = '" . $db
             . "' AND `TABLE_NAME` = '" . $table . "'";
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));
+            return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             return DB::select(DB::raw($query));
         }
@@ -129,7 +129,7 @@ public static function partitionByMonths($table, $column, $schema = null)
         $query .= "PARTITION `dec` VALUES LESS THAN (13)";
         $query .= ")";
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));
+            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             DB::unprepared(DB::raw($query)->getValue());
         }
@@ -246,7 +246,7 @@ public static function partitionByList($table, $column, $partitions, $schema = n
         $query .= self::implodePartitions($partitions);
         $query .= ')';
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));
+            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             DB::unprepared(DB::raw($query));
         }
@@ -268,7 +268,7 @@ public static function partitionByHash($table, $hashColumn, $partitionsNumber, $
         $query = "ALTER TABLE {$appendSchema}{$table} PARTITION BY HASH({$hashColumn}) ";
         $query .= "PARTITIONS {$partitionsNumber};";
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));
+            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             DB::unprepared(DB::raw($query));
         }
@@ -289,7 +289,7 @@ public static function partitionByKey($table, $partitionsNumber, $schema = null)
         $query = "ALTER TABLE {$appendSchema}{$table} PARTITION BY KEY() ";
         $query .= "PARTITIONS {$partitionsNumber};";
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));
+            DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             DB::unprepared(DB::raw($query));
         }
@@ -360,7 +360,7 @@ public static function optimizePartitions($table, $partitions)
     {
         $query = "ALTER TABLE {$table} OPTIMIZE PARTITION " . implode(', ', $partitions);
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));
+            return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             return DB::select(DB::raw($query));
         }
@@ -376,7 +376,7 @@ public static function analyzePartitions($table, $partitions)
     {
         $query = "ALTER TABLE {$table} ANALYZE PARTITION " . implode(', ', $partitions);
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));
+            return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             return DB::select(DB::raw($query));
         }
@@ -394,7 +394,7 @@ public static function repairPartitions($table, $partitions)
     {
         $query = "ALTER TABLE {$table} REPAIR PARTITION " . implode(', ', $partitions);
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));
+            return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             return DB::select(DB::raw($query));
         }
@@ -410,7 +410,7 @@ public static function checkPartitions($table, $partitions)
     {
         $query = "ALTER TABLE {$table} CHECK PARTITION " . implode(', ', $partitions);
         if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {
-            return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));
+            return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));
         } else {
             return DB::select(DB::raw($query));
         }
@@ -444,4 +444,4 @@ private static function getAppVersion(): string
             return '';
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"version":1,"defects":{"SchemaTest::testDropPartition":3,"SchemaTest::testDropPartitions":5,"SchemaTest::testAnalyzePartition":5,"SchemaTest::testAnalyzePartitions":5,"SchemaTest::testRepairPartition":5,"SchemaTest::testRepairPartitions":5,"SchemaTest::testRebuildPartition":5,"SchemaTest::testRebuildPartitions":5,"SchemaTest::testCheckPartition":5,"SchemaTest::testCheckPartitions":5,"SchemaTest::testOptimizePartition":5,"SchemaTest::testOptimizePartitions":5,"SchemaTest::testTruncatePartition":5,"SchemaTest::testTruncatePartitions":5,"SchemaTest::testPartitionByKey":5,"SchemaTest::testPartitionByHash":5,"SchemaTest::testPartitionByRange":5,"SchemaTest::testPartitionByRangeExcludeFuture":5,"SchemaTest::testPartitionByList":5,"SchemaTest::testPartitionByOneYears":5,"SchemaTest::testPartitionByYears":5,"SchemaTest::testPartitionByYearsAndMonths":5,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":5,"MysqlConnectionTest::testGetQueryBuilder":4},"times":{"MysqlConnectionTest::testGetQueryBuilder":0.005,"SchemaTest::testDropPartition":0.004,"SchemaTest::testDropPartitions":0,"SchemaTest::testAnalyzePartition":0.001,"SchemaTest::testAnalyzePartitions":0,"SchemaTest::testRepairPartition":0,"SchemaTest::testRepairPartitions":0,"SchemaTest::testRebuildPartition":0,"SchemaTest::testRebuildPartitions":0,"SchemaTest::testCheckPartition":0,"SchemaTest::testCheckPartitions":0,"SchemaTest::testOptimizePartition":0,"SchemaTest::testOptimizePartitions":0,"SchemaTest::testTruncatePartition":0,"SchemaTest::testTruncatePartitions":0,"SchemaTest::testPartitionByKey":0,"SchemaTest::testPartitionByHash":0,"SchemaTest::testPartitionByRange":0.002,"SchemaTest::testPartitionByRangeExcludeFuture":0,"SchemaTest::testPartitionByList":0,"SchemaTest::testPartitionByOneYears":0,"SchemaTest::testPartitionByYears":0,"SchemaTest::testPartitionByYearsAndMonths":0,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":0}}
	`1`	+{"version":1,"defects":{"SchemaTest::testDropPartition":3,"SchemaTest::testDropPartitions":5,"SchemaTest::testAnalyzePartition":5,"SchemaTest::testAnalyzePartitions":5,"SchemaTest::testRepairPartition":5,"SchemaTest::testRepairPartitions":5,"SchemaTest::testRebuildPartition":5,"SchemaTest::testRebuildPartitions":5,"SchemaTest::testCheckPartition":5,"SchemaTest::testCheckPartitions":5,"SchemaTest::testOptimizePartition":5,"SchemaTest::testOptimizePartitions":5,"SchemaTest::testTruncatePartition":5,"SchemaTest::testTruncatePartitions":5,"SchemaTest::testPartitionByKey":5,"SchemaTest::testPartitionByHash":5,"SchemaTest::testPartitionByRange":5,"SchemaTest::testPartitionByRangeExcludeFuture":5,"SchemaTest::testPartitionByList":5,"SchemaTest::testPartitionByOneYears":5,"SchemaTest::testPartitionByYears":5,"SchemaTest::testPartitionByYearsAndMonths":5,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":5,"MysqlConnectionTest::testGetQueryBuilder":4},"times":{"MysqlConnectionTest::testGetQueryBuilder":0.008,"SchemaTest::testDropPartition":0.007,"SchemaTest::testDropPartitions":0,"SchemaTest::testAnalyzePartition":0.002,"SchemaTest::testAnalyzePartitions":0,"SchemaTest::testRepairPartition":0,"SchemaTest::testRepairPartitions":0,"SchemaTest::testRebuildPartition":0,"SchemaTest::testRebuildPartitions":0,"SchemaTest::testCheckPartition":0,"SchemaTest::testCheckPartitions":0,"SchemaTest::testOptimizePartition":0,"SchemaTest::testOptimizePartitions":0,"SchemaTest::testTruncatePartition":0,"SchemaTest::testTruncatePartitions":0,"SchemaTest::testPartitionByKey":0,"SchemaTest::testPartitionByHash":0,"SchemaTest::testPartitionByRange":0.004,"SchemaTest::testPartitionByRangeExcludeFuture":0,"SchemaTest::testPartitionByList":0,"SchemaTest::testPartitionByOneYears":0,"SchemaTest::testPartitionByYears":0,"SchemaTest::testPartitionByYearsAndMonths":0,"SchemaTest::testPartitionByYearsAndMonthsExcludeFuture":0}}
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static function getPartitionNames($db, $table)`
`49`	`49`	. " WHERE `TABLE_SCHEMA` = '" . $db
`50`	`50`	. "' AND `TABLE_NAME` = '" . $table . "'";
`51`	`51`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`52`		`- return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));`
	`52`	`+ return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`53`	`53`	`} else {`
`54`	`54`	`return DB::select(DB::raw($query));`
`55`	`55`	`}`
`@@ -129,7 +129,7 @@ public static function partitionByMonths($table, $column, $schema = null)`
`129`	`129`	$query .= "PARTITION `dec` VALUES LESS THAN (13)";
`130`	`130`	`$query .= ")";`
`131`	`131`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`132`		`- DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));`
	`132`	`+ DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`133`	`133`	`} else {`
`134`	`134`	`DB::unprepared(DB::raw($query)->getValue());`
`135`	`135`	`}`
`@@ -246,7 +246,7 @@ public static function partitionByList($table, $column, $partitions, $schema = n`
`246`	`246`	`$query .= self::implodePartitions($partitions);`
`247`	`247`	`$query .= ')';`
`248`	`248`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`249`		`- DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));`
	`249`	`+ DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`250`	`250`	`} else {`
`251`	`251`	`DB::unprepared(DB::raw($query));`
`252`	`252`	`}`
`@@ -268,7 +268,7 @@ public static function partitionByHash($table, $hashColumn, $partitionsNumber, $`
`268`	`268`	`$query = "ALTER TABLE {$appendSchema}{$table} PARTITION BY HASH({$hashColumn}) ";`
`269`	`269`	`$query .= "PARTITIONS {$partitionsNumber};";`
`270`	`270`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`271`		`- DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));`
	`271`	`+ DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`272`	`272`	`} else {`
`273`	`273`	`DB::unprepared(DB::raw($query));`
`274`	`274`	`}`
`@@ -289,7 +289,7 @@ public static function partitionByKey($table, $partitionsNumber, $schema = null)`
`289`	`289`	`$query = "ALTER TABLE {$appendSchema}{$table} PARTITION BY KEY() ";`
`290`	`290`	`$query .= "PARTITIONS {$partitionsNumber};";`
`291`	`291`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`292`		`- DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar()));`
	`292`	`+ DB::unprepared(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`293`	`293`	`} else {`
`294`	`294`	`DB::unprepared(DB::raw($query));`
`295`	`295`	`}`
`@@ -360,7 +360,7 @@ public static function optimizePartitions($table, $partitions)`
`360`	`360`	`{`
`361`	`361`	`$query = "ALTER TABLE {$table} OPTIMIZE PARTITION " . implode(', ', $partitions);`
`362`	`362`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`363`		`- return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));`
	`363`	`+ return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`364`	`364`	`} else {`
`365`	`365`	`return DB::select(DB::raw($query));`
`366`	`366`	`}`
`@@ -376,7 +376,7 @@ public static function analyzePartitions($table, $partitions)`
`376`	`376`	`{`
`377`	`377`	`$query = "ALTER TABLE {$table} ANALYZE PARTITION " . implode(', ', $partitions);`
`378`	`378`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`379`		`- return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));`
	`379`	`+ return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`380`	`380`	`} else {`
`381`	`381`	`return DB::select(DB::raw($query));`
`382`	`382`	`}`
`@@ -394,7 +394,7 @@ public static function repairPartitions($table, $partitions)`
`394`	`394`	`{`
`395`	`395`	`$query = "ALTER TABLE {$table} REPAIR PARTITION " . implode(', ', $partitions);`
`396`	`396`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`397`		`- return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));`
	`397`	`+ return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`398`	`398`	`} else {`
`399`	`399`	`return DB::select(DB::raw($query));`
`400`	`400`	`}`
`@@ -410,7 +410,7 @@ public static function checkPartitions($table, $partitions)`
`410`	`410`	`{`
`411`	`411`	`$query = "ALTER TABLE {$table} CHECK PARTITION " . implode(', ', $partitions);`
`412`	`412`	`if (version_compare(static::getAppVersion(),'10.0.0') >= 0) {`
`413`		`- return DB::select(DB::raw($query)->getValue(new MySqlGrammar()));`
	`413`	`+ return DB::select(DB::raw($query)->getValue(new MySqlGrammar(DB::connection())));`
`414`	`414`	`} else {`
`415`	`415`	`return DB::select(DB::raw($query));`
`416`	`416`	`}`
`@@ -444,4 +444,4 @@ private static function getAppVersion(): string`
`444`	`444`	`return '';`
`445`	`445`	`}`
`446`	`446`	`}`
`447`		`-}`
	`447`	`+}`