[Jifty-commit] r5882 - in Jifty-DBI/branches/tisql: t

Jifty commits jifty-commit at lists.jifty.org
Fri Sep 19 19:42:21 EDT 2008


Author: ruz
Date: Fri Sep 19 19:42:21 2008
New Revision: 5882

Modified:
   Jifty-DBI/branches/tisql/   (props changed)
   Jifty-DBI/branches/tisql/t/02searches_joins.t

Log:
* sync from trunk
 r5925 at cubic-pc (orig r5881):  cubic | 2008-09-20 03:36:23 +0400
  r5924 at cubic-pc:  cubic | 2008-09-20 03:36:12 +0400
  * adjust tests a little according to the latest changes
 


Modified: Jifty-DBI/branches/tisql/t/02searches_joins.t
==============================================================================
--- Jifty-DBI/branches/tisql/t/02searches_joins.t	(original)
+++ Jifty-DBI/branches/tisql/t/02searches_joins.t	Fri Sep 19 19:42:21 2008
@@ -90,7 +90,11 @@
     );
     ok( $alias, "Join returns alias" );
     $users_obj->limit( alias => $alias, column => 'id', operator => 'IS NOT', value => 'NULL' );
-    ok( $users_obj->build_select_query !~ /LEFT JOIN/, 'LJ is optimized away');
+    if ( $d eq 'mysql' && $handle->database_version =~ /^[34]/ ) {
+        ok( $users_obj->build_select_query !~ /LEFT JOIN/, 'LJ is optimized away');
+    } else {
+        ok( 1, 'mysql >= 5.0 dont need this optimization' );
+    }
     is( $users_obj->count, 3, "users whos is memebers of at least one group" );
 }
 
@@ -178,7 +182,11 @@
         column2 => 'id'
     );
     $users_obj->limit( alias => $alias, column => 'id', operator => 'IS NOT', value => 'NULL' );
-    ok( $users_obj->build_select_query !~ /LEFT JOIN/, 'both LJs are optimized away');
+    if ( $d eq 'mysql' && $handle->database_version =~ /^[34]/ ) {
+        ok( $users_obj->build_select_query !~ /LEFT JOIN/, 'both LJs are optimized away');
+    } else {
+        ok( 1, 'mysql >= 5.0 dont need this optimization' );
+    }
     is( $users_obj->count, 3, "users whos is memebers of at least one group" );
 }
 


More information about the Jifty-commit mailing list