updated test suite

git-svn-id: http://svn.php.net/repository/pear/packages/SQL_Parser/trunk@263296 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Jul 23, 2008 · fc2398d · fc2398d
1 parent 186243a
commit fc2398d
Show file tree

Hide file tree

Showing 14 changed files with 928 additions and 717 deletions.
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -57,6 +57,7 @@ public function __construct($test, $name)
     public function runTest()
     {
         $parser   = new SQL_Parser();
+        $parser->setDialect($this->_test['dialect']);
         $result   = $parser->parse($this->_test['sql']);
 
         if (false === $result) {
@@ -108,7 +109,15 @@ function sideBySide($array1, $array2)
 
         $message = '';
         for ($i = 0; $i < $lines; $i++) {
+            if (empty($text1[$i])) {
+                $text1[$i] = '';
+            }
+            if (empty($text2[$i])) {
+                $text2[$i] = '';
+            }
+
             $message .= str_pad($text1[$i], 40, ' ');
+
             if ($text1[$i] === $text2[$i]) {
                 $message .= ' = ';
             } else {

diff --git a/tests/generate_testcases.php b/tests/generate_testcases.php
@@ -75,11 +75,20 @@
     foreach ($queries as $query) {
         if ($query) {
             echo ':';
-            if (strpos(trim($query), '-- SQL_PARSER_FLAG_FAIL') === 0) {
+
+            if (strpos($query, '-- SQL_PARSER_FLAG_FAIL') !== false) {
                 $fail = true;
             } else {
                 $fail = false;
             }
+
+            if (strpos($query, '-- SQL_PARSER_FLAG_MYSQL') !== false) {
+                $_dialect = 'MySQL';
+            } else {
+                $_dialect = $dialect;
+            }
+            $parser->setDialect($_dialect);
+
             $results = $parser->parse($query);
             //if (PEAR::isError($results)) {
             if (false === $results) {
@@ -89,9 +98,10 @@
             }
 
             $testcases[] = array(
-                'sql'    => $query,
-            	'expect' => $result,
-            	'fail'   => $fail,
+                'sql'     => $query,
+            	'expect'  => $result,
+            	'fail'    => $fail,
+            	'dialect' => $_dialect,
             );
         }
     }

diff --git a/tests/testcases/between.php b/tests/testcases/between.php
@@ -7,29 +7,40 @@
     'expect' => 
     array (
       'command' => 'select',
-      'column_tables' => 
+      'fields' => 
       array (
-        0 => '',
-        1 => '',
-        2 => '',
-        3 => '',
-      ),
-      'column_names' => 
-      array (
-        0 => 'a',
-        1 => 'b',
-        2 => 'a',
-        3 => 'c',
-      ),
-      'column_aliases' => 
-      array (
-        0 => '',
-        1 => '',
-        2 => '',
-        3 => '',
+        0 => 
+        array (
+          'database' => '',
+          'table' => '',
+          'column' => 'a',
+          'alias' => '',
+        ),
+        1 => 
+        array (
+          'database' => '',
+          'table' => '',
+          'column' => 'b',
+          'alias' => '',
+        ),
+        2 => 
+        array (
+          'database' => '',
+          'table' => '',
+          'column' => 'a',
+          'alias' => '',
+        ),
+        3 => 
+        array (
+          'database' => '',
+          'table' => '',
+          'column' => 'c',
+          'alias' => '',
+        ),
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
 );
 ?>
diff --git a/tests/testcases/create.php b/tests/testcases/create.php
@@ -93,6 +93,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   1 => 
   array (
@@ -187,6 +188,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   2 => 
   array (
@@ -218,6 +220,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   3 => 
   array (
@@ -313,6 +316,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   4 => 
   array (
@@ -408,6 +412,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   5 => 
   array (
@@ -513,6 +518,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   6 => 
   array (
@@ -553,6 +559,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   7 => 
   array (
@@ -593,6 +600,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   8 => 
   array (
@@ -613,6 +621,7 @@
       ),
     ),
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   9 => 
   array (
@@ -625,6 +634,7 @@
     array (
     ),
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   10 => 
   array (
@@ -637,6 +647,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                                          ^ found: ";"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   11 => 
   array (
@@ -648,6 +659,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                                              ^ found: ")"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
 );
 ?>
diff --git a/tests/testcases/delete.php b/tests/testcases/delete.php
@@ -65,6 +65,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   1 => 
   array (
@@ -77,6 +78,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                     ^ found: ";"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   2 => 
   array (
@@ -93,6 +95,7 @@
       ),
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   3 => 
   array (
@@ -105,6 +108,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                      ^ found: "where"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   4 => 
   array (
@@ -116,6 +120,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                                         ^ found: "happy"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
 );
 ?>
diff --git a/tests/testcases/drop.php b/tests/testcases/drop.php
@@ -16,6 +16,7 @@
       'drop_behavior' => 'cascade',
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   1 => 
   array (
@@ -33,6 +34,7 @@
       'drop_behavior' => 'restrict',
     ),
     'fail' => false,
+    'dialect' => 'ANSI',
   ),
   2 => 
   array (
@@ -45,6 +47,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                            ^ found: ","',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   3 => 
   array (
@@ -57,6 +60,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                                  ^ found: "restrict"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   4 => 
   array (
@@ -69,6 +73,7 @@
 -- SQL_PARSER_FLAG_FAIL
                                         ^ found: "where"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
   5 => 
   array (
@@ -80,6 +85,7 @@
 -- SQL_PARSER_FLAG_FAIL
                               ^ found: "elephant"',
     'fail' => true,
+    'dialect' => 'ANSI',
   ),
 );
 ?>