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

fix: [SQLSRV] Query Builder always sets "<database>"."<schema>". to the table name. #8786

Merged
merged 10 commits into from
May 2, 2024
Merged

fix: [SQLSRV] Query Builder always sets "<database>"."<schema>". to the table name. #8786

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
441b889
fix: handle other behavior of sql server.
ping-yee Apr 14, 2024
8ce148f
docs: change the comment.
ping-yee Apr 14, 2024
349f996
style: fix the code style.
ping-yee Apr 14, 2024
6a6a0f2
feat: add the validation.
ping-yee Apr 15, 2024
6a29ef3
feat: Add more validation.
ping-yee Apr 16, 2024
f7d4499
style: do cs fix.
ping-yee Apr 16, 2024
617f70c
fix: decrease the verify amount.
ping-yee Apr 17, 2024
1434af4
feat: extend the code to implement the scenario without database.
ping-yee Apr 17, 2024
d7dd6b4
feat: add the validation.
ping-yee Apr 17, 2024
4ac35c0
feat: change the condition.
ping-yee Apr 18, 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
14 changes: 14 additions & 0 deletions system/Database/SQLSRV/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,20 @@ private function getFullName(string $table): string
}

if ($this->db->escapeChar === '"') {
if (str_contains($table, '.') && ! str_starts_with($table, '.') && ! str_ends_with($table, '.')) {
$dbInfo = explode('.', $table);
$database = $this->db->getDatabase();
$table = $dbInfo[0];

if (isset($dbInfo[1], $dbInfo[2])) {
samsonasik marked this conversation as resolved.
Show resolved Hide resolved
$database = str_replace('"', '', $dbInfo[0]);
$schema = str_replace('"', '', $dbInfo[1]);
$tableName = str_replace('"', '', $dbInfo[2]);

return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias;
}
}

return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias;
}

Expand Down
14 changes: 14 additions & 0 deletions tests/system/Database/Builder/FromTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,18 @@ public function testFromSubqueryWithSQLSRV(): void

$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
}

/**
* @see https://github.com/codeigniter4/CodeIgniter4/issues/8697
*/
public function testConstructorWithMultipleSegmentTableWithSQLSRV(): void
{
$this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);

$builder = new SQLSRVBuilder('database.dbo.table', $this->db);
samsonasik marked this conversation as resolved.
Show resolved Hide resolved

$expectedSQL = 'SELECT * FROM "database"."dbo"."table"';

$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
}
}
Loading