Fix constraints

Use key value pair for mapping source to destination.

Author: sclubricants

system/Database/BaseBuilder.php

@@ -2672,10 +2672,18 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $sql .= 'ON ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key) => ($key instanceof RawSql ?
+                    static fn ($key, $value, $id) => (
+                        $value instanceof RawSql ?
                     $key :
-                    $table . '.' . $key . ' = ' . $alias . '.' . $key),
-                    $constraints
+                    (
+                        is_string($key) ?
+                    $table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
+                    $table . '.' . $value . ' = ' . $alias . '.' . $value
+                    )
+                    ),
+                    array_keys($constraints),
+                    $constraints,
+                    array_fill(0, count($constraints), $this->db->escapeChar)
                 )
             );
 

system/Database/OCI8/Builder.php

@@ -441,10 +441,18 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key) => ($key instanceof RawSql ?
+                    static fn ($key, $value, $id) => (
+                        $value instanceof RawSql ?
                     $key :
-                    $table . '.' . $key . ' = ' . $alias . '.' . $key),
-                    $constraints
+                    (
+                        is_string($key) ?
+                    $table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
+                    $table . '.' . $value . ' = ' . $alias . '.' . $value
+                    )
+                    ),
+                    array_keys($constraints),
+                    $constraints,
+                    array_fill(0, count($constraints), $this->db->escapeChar)
                 )
             );
 

system/Database/Postgre/Builder.php

@@ -431,10 +431,18 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key) => ($key instanceof RawSql ?
+                    static fn ($key, $value, $id) => (
+                        $value instanceof RawSql ?
                     $key :
-                    $table . '.' . $key . ' = ' . $alias . '.' . $key),
-                    $constraints
+                    (
+                        is_string($key) ?
+                    $table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
+                    $table . '.' . $value . ' = ' . $alias . '.' . $value
+                    )
+                    ),
+                    array_keys($constraints),
+                    $constraints,
+                    array_fill(0, count($constraints), $this->db->escapeChar)
                 )
             );