Skip to content

Commit 39608eb

Browse files
committed
Fix escape
escape was fixed in another PR. Needed to remove hack.
1 parent 6e3e6b4 commit 39608eb

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

system/Database/BaseBuilder.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,18 +2702,17 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
27022702
$sql .= 'ON ' . implode(
27032703
' AND ',
27042704
array_map(
2705-
static fn ($key, $value, $id) => (
2705+
static fn ($key, $value) => (
27062706
$value instanceof RawSql ?
27072707
$value :
27082708
(
27092709
is_string($key) ?
2710-
$table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
2710+
$table . '.' . $key . ' = ' . $alias . '.' . $value :
27112711
$table . '.' . $value . ' = ' . $alias . '.' . $value
27122712
)
27132713
),
27142714
array_keys($constraints),
2715-
$constraints,
2716-
array_fill(0, count($constraints), $this->db->escapeChar)
2715+
$constraints
27172716
)
27182717
);
27192718

system/Database/OCI8/Builder.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,18 +465,17 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
465465
$sql .= 'WHERE ' . implode(
466466
' AND ',
467467
array_map(
468-
static fn ($key, $value, $id) => (
468+
static fn ($key, $value) => (
469469
$value instanceof RawSql ?
470470
$value :
471471
(
472472
is_string($key) ?
473-
$table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
473+
$table . '.' . $key . ' = ' . $alias . '.' . $value :
474474
$table . '.' . $value . ' = ' . $alias . '.' . $value
475475
)
476476
),
477477
array_keys($constraints),
478-
$constraints,
479-
array_fill(0, count($constraints), $this->db->escapeChar)
478+
$constraints
480479
)
481480
);
482481

system/Database/Postgre/Builder.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,18 +439,17 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
439439
$sql .= 'WHERE ' . implode(
440440
' AND ',
441441
array_map(
442-
static fn ($key, $value, $id) => (
442+
static fn ($key, $value) => (
443443
$value instanceof RawSql ?
444444
$value :
445445
(
446446
is_string($key) ?
447-
$table . '.' . $id . $key . $id . ' = ' . $alias . '.' . $value :
447+
$table . '.' . $key . ' = ' . $alias . '.' . $value :
448448
$table . '.' . $value . ' = ' . $alias . '.' . $value
449449
)
450450
),
451451
array_keys($constraints),
452-
$constraints,
453-
array_fill(0, count($constraints), $this->db->escapeChar)
452+
$constraints
454453
)
455454
);
456455

0 commit comments

Comments
 (0)