Normalize handling of expected warnings/exceptions in tests

[dbsrgits/SQL-Abstract.git] / t / 11parser.t

diff --git a/t/11parser.t b/t/11parser.t
index 8e1ee05..7cf6509 100644 (file)
--- a/t/11parser.t
+++ b/t/11parser.t
@@ -619,7 +619,7 @@ is_deeply($sqlat->parse("SELECT x, y FROM foo WHERE x IN (?, ?, ?, ?)"), [
   ]
 ], 'Lists parsed correctly');
 
-is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? DESC, unf, baz.g / ? ASC, buzz * 0 DESC, foo DESC, ickk ASC'), [
+is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? DESC, unf, baz.g / ? ASC, buzz * 0 DESC, foo LIKE ? DESC, ickk ASC'), [
   [
     "SELECT",
     [
@@ -665,15 +665,15 @@ is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? D
                     [
                       "+"
                     ]
+                  ],
+                  [
+                    "-PLACEHOLDER",
+                    [
+                      "?"
+                    ]
                   ]
                 ]
               ],
-              [
-                "-PLACEHOLDER",
-                [
-                  "?"
-                ]
-              ]
             ]
           ],
           [
@@ -699,15 +699,15 @@ is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? D
                     [
                       "-"
                     ]
-                  ]
+                  ],
+                  [
+                    "-PLACEHOLDER",
+                    [
+                      "?"
+                    ]
+                  ],
                 ]
               ],
-              [
-                "-PLACEHOLDER",
-                [
-                  "?"
-                ]
-              ]
             ]
           ],
           [
@@ -733,15 +733,15 @@ is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? D
                     [
                       "/"
                     ]
-                  ]
+                  ],
+                  [
+                    "-PLACEHOLDER",
+                    [
+                      "?"
+                    ]
+                  ],
                 ]
               ],
-              [
-                "-PLACEHOLDER",
-                [
-                  "?"
-                ]
-              ]
             ]
           ],
           [
@@ -776,11 +776,22 @@ is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? D
             "-DESC",
             [
               [
-                "-LITERAL",
+                "LIKE",
                 [
-                  "foo"
-                ]
-              ]
+                  [
+                    "-LITERAL",
+                    [
+                      "foo"
+                    ]
+                  ],
+                  [
+                    "-PLACEHOLDER",
+                    [
+                      "?"
+                    ]
+                  ],
+                ],
+              ],
             ]
           ],
           [
@@ -800,7 +811,7 @@ is_deeply($sqlat->parse('SELECT foo FROM bar ORDER BY x + ? DESC, oomph, y - ? D
   ]
 ], 'Crazy ORDER BY parsed correctly');
 
-is_deeply( $sqlat->parse("META SELECT * * FROM (SELECT *, FROM foobar baz buzz) foo bar WHERE NOT NOT NOT EXISTS (SELECT 'cr,ap') AND foo.a = ? STUFF and not (foo.b LIKE 'station') and x = y and a = b and GROUP BY , ORDER BY x x1 x2 y asc, max(y) desc x z desc"), [
+is_deeply( $sqlat->parse("META SELECT * * FROM (SELECT *, FROM foobar baz buzz) foo bar WHERE NOT NOT NOT EXISTS (SELECT 'cr,ap') AND foo.a = ? STUFF moar(stuff) and not (foo.b LIKE 'station') and x = y and a = b and GROUP BY , ORDER BY x x1 x2 y asc, max(y) desc x z desc"), [
   [
     "-LITERAL",
     [
@@ -948,30 +959,46 @@ is_deeply( $sqlat->parse("META SELECT * * FROM (SELECT *, FROM foobar baz buzz)
             ]
           ],
           [
-            "=",
+            "-MISC",
             [
               [
-                "-LITERAL",
-                [
-                  "foo.a"
-                ]
-              ],
-              [
-                "-MISC",
+                "=",
                 [
                   [
+                    "-LITERAL",
+                    [
+                      "foo.a"
+                    ]
+                  ],
+                  [
                     "-PLACEHOLDER",
                     [
                       "?"
                     ]
                   ],
+                ],
+              ],
+              [
+                "-LITERAL",
+                [
+                  "STUFF"
+                ]
+              ],
+            ],
+          ],
+          [
+            'moar',
+            [
+              [
+                '-PAREN',
+                [
                   [
-                    "-LITERAL",
+                    '-LITERAL',
                     [
-                      "STUFF"
+                      'stuff'
                     ]
-                  ]
-                ],
+                 ]
+                ]
               ]
             ]
           ],
@@ -1093,19 +1120,16 @@ is_deeply( $sqlat->parse("META SELECT * * FROM (SELECT *, FROM foobar baz buzz)
             ],
           ],
           [
-            "max",
-            [
-              [
                 "-DESC",
                 [
                   [
                     "-MISC",
                     [
                       [
-                        "-MISC",
+                        "-DESC",
                         [
                           [
-                            "-DESC",
+                            "max",
                             [
                               [
                                 "-PAREN",
@@ -1118,22 +1142,20 @@ is_deeply( $sqlat->parse("META SELECT * * FROM (SELECT *, FROM foobar baz buzz)
                                   ]
                                 ]
                               ]
-                            ]
-                          ],
-                          [
-                            "-LITERAL",
-                            [
-                              "x"
-                            ]
-                          ],
+                            ],
+                          ]
                         ]
                       ],
                       [
                         "-LITERAL",
                         [
-                          "z"
+                          "x"
                         ]
-                      ]
+                      ],
+                  [
+                    "-LITERAL",
+                    [
+                      "z"
                     ]
                   ]
                 ]