thecodingmachine
diff --git a/‎tests/TDBMAbstractServiceTest.php
Lines changed: 14 additions & 8 deletions b/‎tests/TDBMAbstractServiceTest.php
Lines changed: 14 additions & 8 deletions
diff --git a/‎tests/TDBMDaoGeneratorTest.php
Lines changed: 2 additions & 2 deletions b/‎tests/TDBMDaoGeneratorTest.php
Lines changed: 2 additions & 2 deletions
@@ -797,22 +797,28 @@ private static function initSchema(Connection $connection): void
         self::insert($connection, 'all', ['analyze' => 1, 'and' => 1]);
     }
 
-    public static function insert(Connection $connection, string $tableName, array $data): void
+    private static function quoteKeys(Connection $connection, array $data): array
     {
         $quotedData = [];
         foreach ($data as $id => $value) {
             $quotedData[$connection->quoteIdentifier($id)] = $value;
         }
-        $connection->insert($connection->quoteIdentifier($tableName), $quotedData);
+        return $quotedData;
     }
 
-    protected static function delete(Connection $connection, string $tableName, array $data): void
+    public static function insert(Connection $connection, string $tableName, array $data): void
     {
-        $quotedData = [];
-        foreach ($data as $id => $value) {
-            $quotedData[$connection->quoteIdentifier($id)] = $value;
-        }
-        $connection->delete($connection->quoteIdentifier($tableName), $quotedData);
+        $connection->insert($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $data));
+    }
+
+    public static function update(Connection $connection, string $tableName, array $data, array $criteria): void
+    {
+        $connection->update($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $data), self::quoteKeys($connection, $criteria));
+    }
+
+    protected static function delete(Connection $connection, string $tableName, array $criteria): void
+    {
+        $connection->delete($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $criteria));
     }
 
     protected static function isMariaDb(Connection $connection): bool
 
@@ -1161,7 +1161,7 @@ public function testDiscardChangesDiscardsRelations(): void
 
         $oldCount = $countryBean->getBoatsByAnchorageCountry()->count();
 
-        $this->tdbmService->getConnection()->insert('boats', [
+        self::insert($this->tdbmService->getConnection(), 'boats', [
             'name' => 'RoseBud2',
             'anchorage_country' => 1,
             'current_country' => 1,
@@ -1188,7 +1188,7 @@ public function testDiscardChangesDiscardsRowRef(): void
         $this->assertNotEquals($newExpectedId, $oldId, 'The IDs are the same, the test won\'t have any effect');
 
         $userBean->setCountry($countryDao->getById($oldId)); // This triggers the `DbRow::setRef` method which causes the issue
-        $this->tdbmService->getConnection()->update('users', ['country_id' => $newExpectedId], ['id' => 4]);
+        self::update($this->tdbmService->getConnection(), 'users', ['country_id' => $newExpectedId], ['id' => 4]);
 
         $userBean->discardChanges();
Original file line number	Diff line number	Diff line change
`@@ -797,22 +797,28 @@ private static function initSchema(Connection $connection): void`
`797`	`797`	`self::insert($connection, 'all', ['analyze' => 1, 'and' => 1]);`
`798`	`798`	`}`
`799`	`799`
`800`		`- public static function insert(Connection $connection, string $tableName, array $data): void`
	`800`	`+ private static function quoteKeys(Connection $connection, array $data): array`
`801`	`801`	`{`
`802`	`802`	`$quotedData = [];`
`803`	`803`	`foreach ($data as $id => $value) {`
`804`	`804`	`$quotedData[$connection->quoteIdentifier($id)] = $value;`
`805`	`805`	`}`
`806`		`- $connection->insert($connection->quoteIdentifier($tableName), $quotedData);`
	`806`	`+ return $quotedData;`
`807`	`807`	`}`
`808`	`808`
`809`		`- protected static function delete(Connection $connection, string $tableName, array $data): void`
	`809`	`+ public static function insert(Connection $connection, string $tableName, array $data): void`
`810`	`810`	`{`
`811`		`- $quotedData = [];`
`812`		`- foreach ($data as $id => $value) {`
`813`		`- $quotedData[$connection->quoteIdentifier($id)] = $value;`
`814`		`- }`
`815`		`- $connection->delete($connection->quoteIdentifier($tableName), $quotedData);`
	`811`	`+ $connection->insert($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $data));`
	`812`	`+ }`
	`813`	`+`
	`814`	`+ public static function update(Connection $connection, string $tableName, array $data, array $criteria): void`
	`815`	`+ {`
	`816`	`+ $connection->update($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $data), self::quoteKeys($connection, $criteria));`
	`817`	`+ }`
	`818`	`+`
	`819`	`+ protected static function delete(Connection $connection, string $tableName, array $criteria): void`
	`820`	`+ {`
	`821`	`+ $connection->delete($connection->quoteIdentifier($tableName), self::quoteKeys($connection, $criteria));`
`816`	`822`	`}`
`817`	`823`
`818`	`824`	`protected static function isMariaDb(Connection $connection): bool`