You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/02/01 20:00:00 UTC

svn commit: r374144 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ejbql.out master/j9_13/ejbql.out tests/lang/ejbql.sql

Author: djd
Date: Wed Feb  1 10:59:57 2006
New Revision: 374144

URL: http://svn.apache.org/viewcvs?rev=374144&view=rev
Log:
DERBY-680 (partial) Commit part of patch related to modifying ejbql test as it is
separate from the the issue of changing ij.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out?rev=374144&r1=374143&r2=374144&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out Wed Feb  1 10:59:57 2006
@@ -1624,48 +1624,42 @@
 -----------
 NULL       
 ij> autocommit off;
-ij> -- Prepare Statements, should pass and return 1
-prepare p1 as 'select abs(?) from myint';
-ij> prepare p1 as 'select 1 from myint where ? <= 4';
-ij> execute p1 using 'values absval( 4 )';
+ij> values absval( 4 );
 1          
 -----------
-1          
-ij> execute p1 using 'values absval( -4 )';
-1          
------------
-1          
-ij> execute p1 using 'values absval( 4.4 )';
-1          
------------
-1          
-ij> execute p1 using 'values absval( -4.4 )';
-1          
------------
-1          
-ij> -- Prepare Statements, should pass and return 1
-prepare p2 as 'select {fn abs(?)} from myint';
-ij> prepare p2 as 'select 1 from myint where ? <= 4';
-ij> execute p2 using 'values {fn abs( 4 )}';
+4          
+ij> values absval( -4 );
 1          
 -----------
-1          
-ij> execute p2 using 'values {fn abs( -4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( 4.4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( -4.4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( -4.44444444444444444444444 )}';
-1          
------------
-1          
+4          
+ij> values absval( 4.4 );
+1    
+-----
+4.4  
+ij> values absval( -4.4 );
+1    
+-----
+4.4  
+ij> values {fn abs( 4 )};
+1          
+-----------
+4          
+ij> values {fn abs( -4 )};
+1          
+-----------
+4          
+ij> values {fn abs( 4.4 )};
+1    
+-----
+4.4  
+ij> values {fn abs( -4.4 )};
+1    
+-----
+4.4  
+ij> values {fn abs( -4.44444444444444444444444 )};
+1                          
+---------------------------
+4.44444444444444444444444  
 ij> autocommit on;
 ij> drop table myint;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out?rev=374144&r1=374143&r2=374144&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ejbql.out Wed Feb  1 10:59:57 2006
@@ -1624,48 +1624,42 @@
 -----------
 NULL       
 ij> autocommit off;
-ij> -- Prepare Statements, should pass and return 1
-prepare p1 as 'select abs(?) from myint';
-ij> prepare p1 as 'select 1 from myint where ? <= 4';
-ij> execute p1 using 'values absval( 4 )';
+ij> values absval( 4 );
 1          
 -----------
-1          
-ij> execute p1 using 'values absval( -4 )';
-1          
------------
-1          
-ij> execute p1 using 'values absval( 4.4 )';
-1          
------------
-1          
-ij> execute p1 using 'values absval( -4.4 )';
-1          
------------
-1          
-ij> -- Prepare Statements, should pass and return 1
-prepare p2 as 'select {fn abs(?)} from myint';
-ij> prepare p2 as 'select 1 from myint where ? <= 4';
-ij> execute p2 using 'values {fn abs( 4 )}';
+4          
+ij> values absval( -4 );
 1          
 -----------
-1          
-ij> execute p2 using 'values {fn abs( -4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( 4.4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( -4.4 )}';
-1          
------------
-1          
-ij> execute p2 using 'values {fn abs( -4.44444444444444444444444 )}';
-1          
------------
-1          
+4          
+ij> values absval( 4.4 );
+1    
+-----
+4.4  
+ij> values absval( -4.4 );
+1    
+-----
+4.4  
+ij> values {fn abs( 4 )};
+1          
+-----------
+4          
+ij> values {fn abs( -4 )};
+1          
+-----------
+4          
+ij> values {fn abs( 4.4 )};
+1    
+-----
+4.4  
+ij> values {fn abs( -4.4 )};
+1    
+-----
+4.4  
+ij> values {fn abs( -4.44444444444444444444444 )};
+1                          
+---------------------------
+4.44444444444444444444444  
 ij> autocommit on;
 ij> drop table myint;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql.sql?rev=374144&r1=374143&r2=374144&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ejbql.sql Wed Feb  1 10:59:57 2006
@@ -388,22 +388,16 @@
 select abs(a) from myint;
 autocommit off;
 
--- Prepare Statements, should pass and return 1
-prepare p1 as 'select abs(?) from myint';
-prepare p1 as 'select 1 from myint where ? <= 4';
-execute p1 using 'values absval( 4 )';
-execute p1 using 'values absval( -4 )';
-execute p1 using 'values absval( 4.4 )';
-execute p1 using 'values absval( -4.4 )';
+values absval( 4 );
+values absval( -4 );
+values absval( 4.4 );
+values absval( -4.4 );
 
--- Prepare Statements, should pass and return 1
-prepare p2 as 'select {fn abs(?)} from myint';
-prepare p2 as 'select 1 from myint where ? <= 4';
-execute p2 using 'values {fn abs( 4 )}';
-execute p2 using 'values {fn abs( -4 )}';
-execute p2 using 'values {fn abs( 4.4 )}';
-execute p2 using 'values {fn abs( -4.4 )}';
-execute p2 using 'values {fn abs( -4.44444444444444444444444 )}';
+values {fn abs( 4 )};
+values {fn abs( -4 )};
+values {fn abs( 4.4 )};
+values {fn abs( -4.4 )};
+values {fn abs( -4.44444444444444444444444 )};
 autocommit on;
 
 drop table myint;