Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Execute Query without ->from() #238

Merged
merged 5 commits into from
Jan 14, 2024
Merged

Execute Query without ->from() #238

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c3f26c
Execute `Query` without `->from()`
Tigrov Sep 27, 2023
75983e4
Merge branch 'master' into select-without-from
Tigrov Jan 10, 2024
e27a3cd
Fix tests
Tigrov Jan 10, 2024
cf97295
Add line to CHANGELOG.md
Tigrov Jan 12, 2024
c9df69d
Update CHANGELOG.md [skip ci]
Tigrov Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Enh #248: Change property `Schema::$typeMap` to constant `Schema::TYPE_MAP` (@Tigrov)
- Bug #250: Fix `Command::insertWithReturningPks()` method for table without primary keys (@Tigrov)
- Enh #251: Allow to use `DMLQueryBuilderInterface::batchInsert()` method with empty columns (@Tigrov)
- Bug #238: Fix execution `Query` without `->from()` (@Tigrov)

## 1.2.0 November 12, 2023

Expand Down
9 changes: 9 additions & 0 deletions src/DQLQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ public function selectExists(string $rawSql): string
return 'SELECT CASE WHEN EXISTS(' . $rawSql . ') THEN 1 ELSE 0 END FROM DUAL';
}

public function buildFrom(array|null $tables, array &$params): string
{
if (empty($tables)) {
return 'FROM DUAL';
}

return parent::buildFrom($tables, $params);
}

public function buildWithQueries(array $withs, array &$params): string
{
/** @psalm-var array{query:string|Query, alias:ExpressionInterface|string, recursive:bool}[] $withs */
Expand Down
4 changes: 2 additions & 2 deletions tests/QueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public function testBuildWithLimit(): void

$this->assertSame(
<<<SQL
WITH USER_SQL AS (SELECT *), PAGINATION AS (SELECT USER_SQL.*, rownum as rowNumId FROM USER_SQL)
WITH USER_SQL AS (SELECT * FROM DUAL), PAGINATION AS (SELECT USER_SQL.*, rownum as rowNumId FROM USER_SQL)
SELECT * FROM PAGINATION WHERE rownum <= 10
SQL,
$sql,
Expand All @@ -257,7 +257,7 @@ public function testBuildWithOffset(): void

$this->assertSame(
<<<SQL
WITH USER_SQL AS (SELECT *), PAGINATION AS (SELECT USER_SQL.*, rownum as rowNumId FROM USER_SQL)
WITH USER_SQL AS (SELECT * FROM DUAL), PAGINATION AS (SELECT USER_SQL.*, rownum as rowNumId FROM USER_SQL)
SELECT * FROM PAGINATION WHERE rowNumId > 10
SQL,
$sql,
Expand Down
Loading