Skip to content

Commit 5e622c9

Browse files
authored
[HOTFIX] - Include bound parameters for joins within subqueries (#29)
* Include bound subquery join values * Use latest actions/cache package * Updated remaining actions/cache reference
1 parent 0ca9b95 commit 5e622c9

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Cache Composer packages
5858
id: composer-cache
59-
uses: actions/cache@v2
59+
uses: actions/cache@v4
6060
with:
6161
path: vendor
6262
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Cache Composer packages
121121
id: composer-cache
122-
uses: actions/cache@v2
122+
uses: actions/cache@v4
123123
with:
124124
path: vendor
125125
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

lib/PicoDb/Table.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,7 @@ public function joinSubquery(Table $subQuery, string $alias, string $foreign_col
646646

647647
$this->joinValues = array_merge(
648648
$this->joinValues,
649-
$subQuery->getConditionBuilder()->getValues(),
650-
$subQuery->getAggregatedConditionBuilder()->getValues()
649+
$subQuery->getValues()
651650
);
652651

653652
return $this;
@@ -675,8 +674,7 @@ public function innerJoinSubquery(Table $subQuery, string $alias, string $foreig
675674

676675
$this->joinValues = array_merge(
677676
$this->joinValues,
678-
$subQuery->getConditionBuilder()->getValues(),
679-
$subQuery->getAggregatedConditionBuilder()->getValues()
677+
$subQuery->getValues()
680678
);
681679

682680
return $this;

0 commit comments

Comments
 (0)