Skip to content

Fix quotes inside quoted strings #32

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

Open
ngmy wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix quotes inside quoted strings #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0731cb4
Add tests for escaped quote decoding
ngmy Jan 25, 2026
07822b1
Fix escaped quote decoding
ngmy Jan 25, 2026
17ad82d
Add tests for quote doubling lexing
ngmy Jan 25, 2026
eda0b95
Fix quote doubling lexing
ngmy Jan 25, 2026
ada0a6b
Add tests for quote doubling decoding
ngmy Jan 25, 2026
7f5086c
Fix quote doubling decoding
ngmy Jan 25, 2026
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
12 changes: 12 additions & 0 deletions src/SQLParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ private function _lex($sql){
$c += 2;
continue;
}
# quote doubling
if ($sql[$c] == $q && isset($sql[$c+1]) && $sql[$c+1] == $q){
$c += 2;
continue;
}
if ($sql[$c] == $q){
$slen = $c + 1 - $pos;
$source_map[] = array($pos, $slen);
Expand Down Expand Up @@ -1154,8 +1159,11 @@ function decode_value($token){
'n' => "\n",
'r' => "\r",
't' => "\t",
"'" => "'",
'"' => '"',
);
$out = '';
$q = $token[0];
for ($i=1; $i<strlen($token)-1; $i++){
if ($token[$i] == '\\'){
if ($map[$token[$i+1]]){
Expand All @@ -1164,6 +1172,10 @@ function decode_value($token){
$out .= $token[$i+1];
}
$i++;
}elseif ($token[$i] == $q && $token[$i+1] == $q){
# quote doubling
$out .= $q;
$i++;
}else{
$out .= $token[$i];
}
Expand Down
80 changes: 80 additions & 0 deletions tests/FieldTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,86 @@ function testSets(){

# ENUM(value1,value2,value3,...) [CHARACTER SET charset_name] [COLLATE collation_name]
# SET(value1,value2,value3,...) [CHARACTER SET charset_name] [COLLATE collation_name]

# a `\'` inside a string quoted with `'`
$tbl = $this->get_first_table("CREATE TABLE foo (bar ENUM('hel\'lo'))");
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array("hel'lo"),
)
));

# a `\"` inside a string quoted with `"`
$tbl = $this->get_first_table('CREATE TABLE foo (bar ENUM("hel\"lo"))');
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array('hel"lo'),
)
));

# a `\'` inside a string quoted with `"`
$tbl = $this->get_first_table("CREATE TABLE foo (bar ENUM(\"hel\'lo\"))");
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array("hel'lo"),
)
));

# a `\"` inside a string quoted with `'`
$tbl = $this->get_first_table('CREATE TABLE foo (bar ENUM(\'hel\"lo\'))');
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array('hel"lo'),
)
));

# a `''` inside a string quoted with `'`
$tbl = $this->get_first_table("CREATE TABLE foo (bar ENUM('hel''lo'))");
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array("hel'lo"),
)
));

# a `""` inside a string quoted with `"`
$tbl = $this->get_first_table('CREATE TABLE foo (bar ENUM("hel""lo"))');
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array('hel"lo'),
)
));

# a `''` inside a string quoted with `"`
$tbl = $this->get_first_table("CREATE TABLE foo (bar ENUM(\"hel''lo\"))");
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array("hel''lo"),
)
));

# a `""` inside a string quoted with `'`
$tbl = $this->get_first_table('CREATE TABLE foo (bar ENUM(\'hel""lo\'))');
$this->assertEquals($tbl['fields'], array(
array(
'name' => "bar",
'type' => "ENUM",
'values' => array('hel""lo'),
)
));
}


Expand Down
12 changes: 12 additions & 0 deletions tests/LexTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,17 @@ public function testStrings(){

$this->lex_test("foo \"bar\" baz", array("foo", "\"bar\"", "baz"));
$this->lex_test("foo \"bar \\\" baz\" qux", array("foo", "\"bar \\\" baz\"", "qux"));

# a `''` inside a string quoted with `'`
$this->lex_test("'hel''lo'", array("'hel''lo'"));

# a `""` inside a string quoted with `"`
$this->lex_test('"hel""lo"', array('"hel""lo"'));

# a `''` inside a string quoted with `"`
$this->lex_test("\"hel''lo\"", array("\"hel''lo\""));

# a `""` inside a string quoted with `'`
$this->lex_test('\'hel""lo\'', array('\'hel""lo\''));
}
}