From f585ec91a74609cbabe32a6c23f761d18f2bb718 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 24 Sep 2008 15:03:14 +0000
Subject: [PATCH] updated tests to reflect api changes

---
 t/Crud.t | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/t/Crud.t b/t/Crud.t
index b62d899fc..46c0d089c 100644
--- a/t/Crud.t
+++ b/t/Crud.t
@@ -28,7 +28,7 @@ my $session         = WebGUI::Test->session;
 #----------------------------------------------------------------------------
 # Tests
 
-plan tests => 54;        # Increment this number for each test you create
+plan tests => 53;        # Increment this number for each test you create
 
 #----------------------------------------------------------------------------
 
@@ -101,25 +101,23 @@ isnt($copyOfRecord4->get('lastUpdated'), $copyOfRecord4->get('dateCreated'), "up
 
 # retrieve data
 my ($sql, $params) = WebGUI::Crud->getAllSql($session);
-is($sql, "select `id` from `unnamed_crud_table` order by sequenceNumber", "getAllSql() SQL no options");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` order by `unnamed_crud_table`.`sequenceNumber`", "getAllSql() SQL no options");
 ($sql, $params) = WebGUI::Crud->getAllSql($session, {sequenceKeyValue=>1});
-is($sql, "select `id` from `unnamed_crud_table` order by sequenceNumber", "getAllSql() SQL sequence key value with no key specified");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` order by `unnamed_crud_table`.`sequenceNumber`", "getAllSql() SQL sequence key value with no key specified");
 is($params->[0], undef, "getAllSql() PARAMS sequence key value with no key specified");
 ($sql, $params) = WebGUI::Crud->getAllSql($session, {limit=>5});
-is($sql, "select `id` from `unnamed_crud_table` order by sequenceNumber limit 5", "getAllSql() SQL with a row limit");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` order by `unnamed_crud_table`.`sequenceNumber` limit 5", "getAllSql() SQL with a row limit");
 ($sql, $params) = WebGUI::Crud->getAllSql($session,{limit=>[10,20]});
-is($sql, "select `id` from `unnamed_crud_table` order by sequenceNumber limit 10,20", "getAllSql() SQL with a start and row limit");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` order by `unnamed_crud_table`.`sequenceNumber` limit 10,20", "getAllSql() SQL with a start and row limit");
 ($sql, $params) = WebGUI::Crud->getAllSql($session,{orderBy=>'lastUpdated'});
-is($sql, "select `id` from `unnamed_crud_table` order by `lastUpdated`", "getAllSql() with a custom order by clause");
-($sql, $params) = WebGUI::Crud->getAllSql($session,{orderBy=>{lastUpdated=>'desc'}});
-is($sql, "select `id` from `unnamed_crud_table` order by `lastUpdated` desc", "getAllSql() with a custom two part order by clause");
-($sql, $params) = WebGUI::Crud->getAllSql($session,{orderBy=>[{lastUpdated=>'desc'},{sequenceNumber=>'asc'}]});
-is($sql, "select `id` from `unnamed_crud_table` order by `lastUpdated` desc, `sequenceNumber` asc", "getAllSql() with a custom multi-field order by clause");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` order by lastUpdated", "getAllSql() with a custom order by clause");
+($sql, $params) = WebGUI::Crud->getAllSql($session,{join=>['someTable using (someId)']});
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` left join someTable using (someId) order by `unnamed_crud_table`.`sequenceNumber`", "getAllSql() with a custom join");
 ($sql, $params) = WebGUI::Crud->getAllSql($session,{constraints=>[{'sequenceNumber=?'=>1}]});
-is($sql, "select `id` from `unnamed_crud_table` where (sequenceNumber=?) order by sequenceNumber", "getAllSql() SQL with a constraint");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` where (sequenceNumber=?) order by `unnamed_crud_table`.`sequenceNumber`", "getAllSql() SQL with a constraint");
 is($params->[0], 1, "getAllSql PARAMS with a constraint");
 ($sql, $params) = WebGUI::Crud->getAllSql($session,{constraints=>[{'sequenceNumber=? or sequenceNumber=?'=>[1,2]}]});
-is($sql, "select `id` from `unnamed_crud_table` where (sequenceNumber=? or sequenceNumber=?) order by sequenceNumber", "getAllSql() SQL with two constraints");
+is($sql, "select `unnamed_crud_table`.`id` from `unnamed_crud_table` where (sequenceNumber=? or sequenceNumber=?) order by `unnamed_crud_table`.`sequenceNumber`", "getAllSql() SQL with two constraints");
 is($params->[1], 2, "getAllSql PARAMS with two constraints");
 is(scalar(@{WebGUI::Crud->getAllIds($session)}), 3, "getAllIds()");
 my $iterator = WebGUI::Crud->getAllIterator($session);