Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/PHPSQLParser/utils/PHPSQLParserConstants.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class PHPSQLParserConstants {
'BITLENGTH', 'CAST', 'CEILING', 'CHAR', 'CHAR_LENGTH', 'CHARACTER_LENGTH', 'CHARSET',
'COALESCE', 'COERCIBILITY', 'COLLATION', 'COMPRESS', 'CONCAT', 'CONCAT_WS',
'CONNECTION_ID', 'CONV', 'CONVERT', 'CONVERT_TZ', 'COS', 'COT', 'COUNT', 'CRC32',
'CURDATE', 'CURRENT_USER', 'CURRVAL', 'CURTIME', 'DATABASE', 'SCHEMA', 'DATE_ADD', 'DATE_DIFF',
'CURDATE', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'CURRVAL', 'CURTIME', 'DATABASE', 'SCHEMA', 'DATE_ADD', 'DATE_DIFF',
'DATE_FORMAT', 'DATE_SUB', 'DAY', 'DAYNAME', 'DAYOFMONTH', 'DAYOFWEEK', 'DAYOFYEAR',
'DECODE', 'DEFAULT', 'DEGREES', 'DES_DECRYPT', 'DES_ENCRYPT', 'ELT', 'ENCODE',
'ENCRYPT', 'EXP', 'EXPORT_SET', 'EXTRACT', 'FIELD', 'FIND_IN_SET', 'FLOOR', 'FORMAT',
Expand Down
30 changes: 30 additions & 0 deletions tests/cases/creator/issue368Test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
/**
* issue368.php
*
* Test case for PHPSQLCreator.
*/

namespace PHPSQLParser\Test\Creator;

use PHPSQLParser\PHPSQLParser;
use PHPSQLParser\PHPSQLCreator;

class Issue368Test extends \PHPUnit\Framework\TestCase
{
/*
* https://github.com/greenlion/PHP-SQL-Parser/issues/368
* CURRENT_TIMESTAMP is detected as a reserved word an generate errors when used in JOIN clause
*/
public function testIssue368()
{
$sql = "SELECT foo FROM barTable LEFT JOIN bazTable ON barTable.a = bazTable.a AND bazTable.d <= CURRENT_TIMESTAMP"; // KO

$parser = new PHPSQLParser();
$creator = new PHPSQLCreator();

$parser->parse($sql);

$this->assertEquals($sql, $creator->create($parser->parsed));
}
}
3 changes: 1 addition & 2 deletions tests/cases/parser/issue320Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@
*/
namespace PHPSQLParser\Test\Parser;
use PHPSQLParser\PHPSQLParser;
use PHPSQLParser\PHPSQLCreator;

class issue320Test extends \PHPUnit_Framework_TestCase
class issue320Test extends \PHPUnit\Framework\TestCase
{
public function test_no_warning_is_issued_when_help_table_is_used()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/parser/issue335Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

use PHPSQLParser\PHPSQLParser;

class issue335Test extends \PHPUnit_Framework_TestCase
class issue335Test extends \PHPUnit\Framework\TestCase
{
/**
* @test
Expand Down