ORDER BY, HAVING, GROUP BY and WHERE clauses on select

[dbsrgits/SQL-Abstract-2.0-ish.git] / t / 001_basic.t

diff --git a/t/001_basic.t b/t/001_basic.t
index ce0bb8f..849a982 100644 (file)
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -1,132 +1,52 @@
 use strict;
 use warnings;
 
-use Test::More tests => 15;
+use Test::More tests => 9;
 use Test::Differences;
 
 use_ok('SQL::Abstract') or BAIL_OUT( "$@" );
+use_ok('SQL::Abstract::AST::v1') or BAIL_OUT( "$@" );
 
-# TODO: once MXMS supports %args, use that here
 my $sqla = SQL::Abstract->create(1);
-is $sqla->dispatch( [ -name => qw/me id/]), "me.id",
-  "Simple name generator";
-
-is $sqla->dispatch(
-  [ -list => 
-    [ -name => qw/me id/],
-    [ -name => qw/me foo bar/],
-    [ -name => qw/bar/]
-  ] 
-), "me.id, me.foo.bar, bar",
-  "List generator";
-
-is $sqla->dispatch(
-  [ -alias => [ -name => qw/me id/], "foobar", ] 
-), "me.id AS foobar",
-  "Alias generator";
-
-is $sqla->dispatch(
-  [ -order_by => [ -name => qw/me date/ ] ]
-), "ORDER BY me.date";
-
-is $sqla->dispatch(
-  [ -order_by => 
-    [ -name => qw/me date/ ],
-    [ -name => qw/me foobar/ ],
-  ]
-), "ORDER BY me.date, me.foobar";
 
-is $sqla->dispatch(
-  [ -order_by => [ -desc => [ -name => qw/me date/ ] ] ]
-), "ORDER BY me.date DESC";
+# TODO: once MXMS supports %args, use that here
+is $sqla->dispatch( { -type => 'name', args => [qw/me id/] }), "me.id",
+  "Simple name generator";
 
+is $sqla->dispatch( { -type => 'name', args => [qw/me */]}),
+   "me.*",
+   "Simple name generator";
 
-is $sqla->dispatch(
-  [ -where =>
-      [ '>', [-name => qw/me id/], [-value => 500 ] ]
-  ]
-), "WHERE me.id > ?", "where clause";
+$sqla->quote_chars(['`']);
 
-eq_or_diff( [ SQL::Abstract->generate(
-    [ -ast_version => 1,
-      -where =>
-        [ '>', [-name => qw/me id/], [-value => 500 ] ],
-        [ '==', [-name => qw/me name/], [-value => '200' ] ]
-    ]
-  ) ], 
-  [ "WHERE me.id > ? AND me.name = ?",
-    [ 500,
-      '200'
-    ]
-  ],
-  "Where with binds"
-);
+is $sqla->dispatch( { -type => 'name', args => [qw/me */]}),
+   "`me`.*",
+   "Simple name generator";
 
+$sqla->disable_quoting;
 
 is $sqla->dispatch(
-  [ -where =>  -or =>
-      [ '>', [-name => qw/me id/], [-value => 500 ] ],
-      [ '==', [-name => qw/me name/], [-value => '200' ] ],
-  ]
-), "WHERE me.id > ? OR me.name = ?", "where clause";
-
+  { -type => 'false' }
+), "0 = 1", "false value";
 
 is $sqla->dispatch(
-  [ -where =>  -or =>
-      [ '>', [-name => qw/me id/], [-value => 500 ] ],
-      [ -or => 
-        [ '==', [-name => qw/me name/], [-value => '200' ] ],
-        [ '==', [-name => qw/me name/], [-value => '100' ] ]
-      ]
-  ]
-), "WHERE me.id > ? OR me.name = ? OR me.name = ?", "where clause";
+  { -type => 'true' }
+), "1 = 1", "true value";
 
 is $sqla->dispatch(
-  [ -where =>  -or =>
-      [ '==', [-name => qw/me id/], [-value => 500 ] ],
-      [ -and => 
-        [ '>', [-name => qw/me name/], [-value => '200' ] ],
-        [ '<', [-name => qw/me name/], [-value => '100' ] ]
-      ]
-  ]
-), "WHERE me.id = ? OR me.name > ? AND me.name < ?", "where clause";
-
-is $sqla->dispatch(
-  [ -where =>  -and =>
-      [ '==', [-name => qw/me id/], [-value => 500 ] ],
-      [ -and => 
-        [ '>', [-name => qw/me name/], [-value => '200' ] ],
-        [ '<', [-name => qw/me name/], [-value => '100' ] ]
-      ]
-  ]
-), "WHERE me.id = ? AND me.name > ? AND me.name < ?", "where clause";
-
+  { -type => 'list',
+    args => [
+      { -type => name => args => [qw/me id/] },
+      { -type => name => args => [qw/me foo bar/] },
+      { -type => name => args => [qw/bar/] }
+    ] 
+  }
+), "me.id, me.foo.bar, bar",
+  "List generator";
 
 is $sqla->dispatch(
-  [ -where =>  -and =>
-      [ '==', [-name => qw/me id/], [-value => 500 ] ],
-      [ -or => 
-        [ '>', [-name => qw/me name/], [-value => '200' ] ],
-        [ '<', [-name => qw/me name/], [-value => '100' ] ]
-      ]
-  ]
-), "WHERE me.id = ? AND (me.name > ? OR me.name < ?)", "where clause";
+  { -type => 'alias', ident => { -type => name => args => [qw/me id/]}, as => "foobar" } 
+), "me.id AS foobar",
+  "Alias generator";
 
-eq_or_diff(
-  [SQL::Abstract->generate(
-    [ -ast_version => 1,
-      -where =>
-      [ -in => 
-        [-name => qw/me id/],
-        [-value => '100' ],
-        [-value => '200' ],
-        [-value => '300' ],
-      ]
-    ]
-  ) ],
 
-  [ "WHERE me.id IN (?, ?, ?)", 
-    [ qw/100 200 300/]
-  ],
-  
-  "where IN clause");