db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1448002 [5/6] - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ engine/org/apache/derby/iapi/reference/ engine/org/apache/derby/iapi/types/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTest...
Date Wed, 20 Feb 2013 04:42:58 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out Wed Feb 20 04:42:57 2013
@@ -2219,8 +2219,8 @@ ij> select c_ti, si, c_si, i, c_i from a
 C_TI|SI    |C_SI      |I          |C_I                           
 -----------------------------------------------------------------
 ij> select li, c_li, r, c_r, dp, c_dp from all1, all_c1;
-LI                  |C_LI                          |R            |C_R                                               |DP                    |C_DP                                              
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+LI                  |C_LI                          |R              |C_R                                               |DP                      |C_DP                                              
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> select dc, c_dc, num, c_num, c_bool from all1, all_c1;
 DC     |C_DC      |NUM    |C_NUM                                             |C_BO&
 -----------------------------------------------------------------------------------
@@ -2242,8 +2242,8 @@ ij> select c_ti, si, c_si, i, c_i from a
 C_TI|SI    |C_SI      |I          |C_I                           
 -----------------------------------------------------------------
 ij> select li, c_li, r, c_r, dp, c_dp from all1, all_c1;
-LI                  |C_LI                          |R            |C_R                                               |DP                    |C_DP                                              
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+LI                  |C_LI                          |R              |C_R                                               |DP                      |C_DP                                              
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> select dc, c_dc, num, c_num, c_bool from all1, all_c1;
 DC     |C_DC      |NUM    |C_NUM                                             |C_BO&
 -----------------------------------------------------------------------------------
@@ -2275,9 +2275,9 @@ ij> alter table all1 add column vc30 var
 ij> alter table all1 add column lvc2 long varchar ;
 0 rows inserted/updated/deleted
 ij> select * from all1;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |C30                           |VC30                          |LVC2                                                                                                                            
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-2     |3          |4                   |5.5          |6.6                   |7.7    |8.8    |0020|0020|0020                                                                                                                            |1996-09-09|12:12:12|1996-09-09 12:12:12.5        |1   |2   |33333333                                                                                                                        |NULL                          |NULL                          |NULL                                                                                                                            
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |C30                           |VC30                          |LVC2                                                                                                                            
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+2     |3          |4                   |5.5            |6.6                     |7.7    |8.8    |0020|0020|0020                                                                                                                            |1996-09-09|12:12:12|1996-09-09 12:12:12.5        |1   |2   |33333333                                                                                                                        |NULL                          |NULL                          |NULL                                                                                                                            
 ij> update all1 set si = '11';
 ERROR 42821: Columns of type 'SMALLINT' cannot hold values of type 'CHAR'. 
 ij> update all1 set i = '11';
@@ -2307,9 +2307,9 @@ ij> update all1 set tms = '1990-01-01 08
 ij> update all1 set lvc = '44444444';
 1 row inserted/updated/deleted
 ij> select * from all1;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |C30                           |VC30                          |LVC2                                                                                                                            
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-2     |3          |4                   |5.5          |6.6                   |7.7    |8.8    |2120|21  |21                                                                                                                              |1900-01-01|08:08:08|1990-01-01 08:08:08.6        |1   |2   |44444444                                                                                                                        |NULL                          |NULL                          |NULL                                                                                                                            
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |C30                           |VC30                          |LVC2                                                                                                                            
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+2     |3          |4                   |5.5            |6.6                     |7.7    |8.8    |2120|21  |21                                                                                                                              |1900-01-01|08:08:08|1990-01-01 08:08:08.6        |1   |2   |44444444                                                                                                                        |NULL                          |NULL                          |NULL                                                                                                                            
 ij> select c30, vc30, lvc2 from all1;
 C30                           |VC30                          |LVC2                                                                                                                            
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -3871,26 +3871,26 @@ where b.si = a.lvc;
 ERROR 42818: Comparisons between 'SMALLINT' and 'LONG VARCHAR (UCS_BASIC)' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')
 ij> select * from all1 a, all1 b 
 where a.dt = b.c;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select * from all1 a, all1 b 
 where a.dt = b.vc;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select * from all1 a, all1 b 
 where a.dt = b.lvc;
 ERROR 42818: Comparisons between 'DATE' and 'LONG VARCHAR (UCS_BASIC)' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')
 ij> select * from all1 a, all1 b 
 where b.dt = a.c;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select * from all1 a, all1 b 
 where b.dt = a.vc;
-SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R              |DP                      |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select * from all1 a, all1 b 
 where b.dt = a.lvc;
@@ -3899,4 +3899,4 @@ ij> -- clean up 
 drop table all1;
 0 rows inserted/updated/deleted
 ij> commit;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out Wed Feb 20 04:42:57 2013
@@ -322,31 +322,31 @@ ij> insert into i2 select dp, dp, dp, dp
 ij> insert into i2 select dc, dc, dc, dc, dc, dc, dc from i1;
 2 rows inserted/updated/deleted
 ij> select * from i2;
-I          |T          |S     |L                   |R            |DP                    |DC    
------------------------------------------------------------------------------------------------
-1          |1          |1     |1                   |1.0          |1.0                   |1     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-2          |2          |2     |2                   |2.0          |2.0                   |2     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-3          |3          |3     |3                   |3.0          |3.0                   |3     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-4          |4          |4     |4                   |4.0          |4.0                   |4     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-5          |5          |5     |5                   |5.5          |5.5                   |5     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-6          |6          |6     |6                   |6.6          |6.6                   |6     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
-7          |7          |7     |7                   |7.0          |7.0                   |7     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
+I          |T          |S     |L                   |R              |DP                      |DC    
+---------------------------------------------------------------------------------------------------
+1          |1          |1     |1                   |1.0            |1.0                     |1     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+2          |2          |2     |2                   |2.0            |2.0                     |2     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+3          |3          |3     |3                   |3.0            |3.0                     |3     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+4          |4          |4     |4                   |4.0            |4.0                     |4     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+5          |5          |5     |5                   |5.5            |5.5                     |5     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+6          |6          |6     |6                   |6.6            |6.6                     |6     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
+7          |7          |7     |7                   |7.0            |7.0                     |7     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
 ij> delete from i2;
 14 rows inserted/updated/deleted
 ij> insert into i2 select i, t, s, l, r, dp, dc from tab1;
 2 rows inserted/updated/deleted
 ij> select * from i2;
-I          |T          |S     |L                   |R            |DP                    |DC    
------------------------------------------------------------------------------------------------
-1          |2          |3     |4                   |5.5          |6.6                   |7     
-NULL       |NULL       |NULL  |NULL                |NULL         |NULL                  |NULL  
+I          |T          |S     |L                   |R              |DP                      |DC    
+---------------------------------------------------------------------------------------------------
+1          |2          |3     |4                   |5.5            |6.6                     |7     
+NULL       |NULL       |NULL  |NULL                |NULL           |NULL                    |NULL  
 ij> -- get the rest
 create table i3 (b char(1) for bit data, 
 			bv varchar(1) for bit data, 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out Wed Feb 20 04:42:57 2013
@@ -613,10 +613,10 @@ create table d (d double precision);
 ij> insert into d values 1e-300,2e-300;
 2 rows inserted/updated/deleted
 ij> select d,d/1e5 as dd from d order by dd,d;
-D                     |DD                    
----------------------------------------------
-1.0E-300              |1.0E-305              
-2.0E-300              |2.0E-305              
+D                       |DD                      
+-------------------------------------------------
+1.0E-300                |1.0E-305                
+2.0E-300                |2.0E-305                
 ij> rollback ;
 ij> -- . order by with long values (varchars)
 create table v (v varchar(1200));
@@ -666,12 +666,12 @@ S     
 2     
 2     
 ij> select r from missed order by r;
-R            
--------------
-10000.0      
-10000.0      
-12000.0      
-12000.0      
+R              
+---------------
+10000.0        
+10000.0        
+12000.0        
+12000.0        
 ij> select d,c from missed order by c,d;
 D         |C         
 ---------------------
@@ -792,10 +792,10 @@ ij> insert into tab1 values (1, cast(1 a
 ij> insert into tab1 values (2, cast(2 as int), cast(2 as smallint), cast(2 as bigint), '2', '2', '2', cast(2.2 as double precision), cast(2.2 as real), '1995-02-02', '12:12:12', '1996-02-02 12:10:10.1', cast(2.2 as decimal(2,1)));
 1 row inserted/updated/deleted
 ij> select * from tab1 order by 1;
-I          |TN         |S          |L          |C         |V         |LVC       |D                     |R            |DT        |T       |TS                           |DC  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-1          |1          |1          |1          |1         |1         |1         |1.1                   |1.1          |1996-01-01|11:11:11|1996-01-01 11:10:10.1        |1.1 
-2          |2          |2          |2          |2         |2         |2         |2.2                   |2.2          |1995-02-02|12:12:12|1996-02-02 12:10:10.1        |2.2 
+I          |TN         |S          |L          |C         |V         |LVC       |D                       |R              |DT        |T       |TS                           |DC  
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+1          |1          |1          |1          |1         |1         |1         |1.1                     |1.1            |1996-01-01|11:11:11|1996-01-01 11:10:10.1        |1.1 
+2          |2          |2          |2          |2         |2         |2         |2.2                     |2.2            |1995-02-02|12:12:12|1996-02-02 12:10:10.1        |2.2 
 ij> rollback;
 ij> -- bug 2769 (correlation columns, group by and order by)
 create table bug2769(c1 int, c2 int);
@@ -2090,19 +2090,19 @@ ID         |C3_BIGINT           
 3          |3                   
 4          |NULL                
 ij> select id, c4_real from d2887_types order by c4_real desc;
-ID         |C4_REAL      
--------------------------
-4          |NULL         
-3          |3.0          
-2          |2.0          
-1          |1.0          
+ID         |C4_REAL        
+---------------------------
+4          |NULL           
+3          |3.0            
+2          |2.0            
+1          |1.0            
 ij> select id, c5_float from d2887_types order by c5_float asc nulls last;
-ID         |C5_FLOAT              
-----------------------------------
-1          |1.0                   
-2          |2.0                   
-3          |3.0                   
-4          |NULL                  
+ID         |C5_FLOAT                
+------------------------------------
+1          |1.0                     
+2          |2.0                     
+3          |3.0                     
+4          |NULL                    
 ij> select id, c6_numeric from d2887_types order by c6_numeric desc nulls last;
 ID         |C6_NUMERIC  
 ------------------------
@@ -2372,4 +2372,4 @@ ij> -- OK, don't sort
 
 drop table d6027;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out Wed Feb 20 04:42:57 2013
@@ -52,14 +52,14 @@ Consult your DBMS server reference docum
 ij> -- this should succeed
 get cursor c0 as 'select * from t1 for update';
 ij> next c0;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c0;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c0;
 ij> -- restore t1
 delete from t1;
@@ -68,9 +68,9 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .same table name
 -- .cursor before 1st row
 get cursor c1 as 'select * from t2 for update';
@@ -86,9 +86,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .non-existant table
 delete from not_exists where current of c1;
 ERROR 42X28: Delete table 'NOT_EXISTS' is not target of cursor 'C1'.
@@ -104,9 +104,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .match correlation name
 -- (this one should fail, since correlation name)
 delete from asdf where current of c2;
@@ -124,9 +124,9 @@ ERROR 42X30: Cursor 'C44' not found. Ver
 ij> -- .target cursor after last row
 get cursor c4 as 'select * from t1 for update';
 ij> next c4;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> next c4;
 No current row
 ij> next c4;
@@ -142,14 +142,14 @@ ERROR 42X30: Cursor 'C5' not found. Veri
 ij> -- .target cursor on row
 get cursor c6 as 'select * from t1 for update';
 ij> next c6;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c6;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c6;
 ij> -- restore t1
 delete from t1;
@@ -158,27 +158,27 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .target cursor on row deleted by another cursor
 get cursor c7 as 'select * from t1 for update';
 ij> next c7;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> get cursor c8 as 'select * from t1 for update';
 ij> next c8;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c7;
 1 row inserted/updated/deleted
 ij> delete from t1 where current of c8;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c7;
 ij> close c8;
 ij> -- restore t1
@@ -188,22 +188,22 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .target cursor on already deleted row
 get cursor c9 as 'select * from t1 for update';
 ij> next c9;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c9;
 1 row inserted/updated/deleted
 ij> delete from t1 where current of c9;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c9;
 ij> -- restore t1
 delete from t1;
@@ -212,27 +212,27 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- delete to row which was subject to searched update
 -- (row still within cursor qualification)
 get cursor c10 as 'select * from t1 for update';
 ij> next c10;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c10;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c10;
 ij> -- restore t1
 delete from t1;
@@ -241,28 +241,28 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- delete to row which was subject to searched update
 -- (row becomes outside of cursor qualification)
 get cursor c10a as 'select * from t1 where i = 1 for update';
 ij> next c10a;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c10a;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> close c10a;
 ij> -- restore t1
 delete from t1;
@@ -270,28 +270,28 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- delete to row which was subject to positioned update
 -- (row becomes outside of cursor qualification)
 get cursor c11 as 'select * from t1 where i = 1 for update';
 ij> next c11;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1 where current of c11;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c11;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> close c11;
 ij> -- restore t1
 delete from t1;
@@ -299,29 +299,29 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- delete to row which was subject to 2 searched updates
 -- (1st puts row outside of cursor qualification, 2nd restores it)
 get cursor c12 as 'select * from t1 where i = 1 for update';
 ij> next c12;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> update t1 set i = 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c12;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c12;
 ij> -- restore t1
 delete from t1;
@@ -330,9 +330,9 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- positioned delete on table with index (#724)
 create table t5 (c1 int, c2 int);
 0 rows inserted/updated/deleted
@@ -440,21 +440,21 @@ Consult your DBMS server reference docum
 ij> -- this should succeed
 get cursor c0 as 'select * from t1 for update';
 ij> next c0;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = 999 where current of c0;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-999        |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+999        |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = 1 where current of c0;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> close c0;
 ij> -- .same table name
 -- .cursor before 1st row
@@ -491,9 +491,9 @@ ERROR 42X30: Cursor 'C44' not found. Ver
 ij> -- .target cursor after last row
 get cursor c4 as 'select * from t1 for update';
 ij> next c4;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> next c4;
 No current row
 ij> next c4;
@@ -509,22 +509,22 @@ ERROR 42X30: Cursor 'C5' not found. Veri
 ij> -- .target cursor on row
 get cursor c6 as 'select * from t1 for update';
 ij> next c6;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1 where current of c6;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> -- .consecutive updates to same row in cursor, keeping it in the cursor qual
 update t1 set i = i + 1 where current of c6;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-3          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+3          |1111111111|1.1E12                  |11:11:11
 ij> close c6;
 ij> -- restore t1
 delete from t1;
@@ -532,27 +532,27 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .target cursor on row deleted by another cursor
 get cursor c7 as 'select * from t1 for update';
 ij> next c7;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> get cursor c8 as 'select * from t1 for update';
 ij> next c8;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c7;
 1 row inserted/updated/deleted
 ij> update t1 set i = i + 1 where current of c8;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c7;
 ij> close c8;
 ij> -- restore t1
@@ -562,22 +562,22 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .target cursor on already deleted row
 get cursor c9 as 'select * from t1 for update';
 ij> next c9;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> delete from t1 where current of c9;
 1 row inserted/updated/deleted
 ij> update t1 set i = i + 1 where current of c9;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
+I          |V         |D                       |T       
+--------------------------------------------------------
 ij> close c9;
 ij> -- restore t1
 delete from t1;
@@ -586,28 +586,28 @@ WARNING 02000: No row was found for FETC
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update to row which was subject to searched update
 -- (row still within cursor qualification)
 get cursor c10 as 'select * from t1 for update';
 ij> next c10;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 2 where current of c10;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-4          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+4          |1111111111|1.1E12                  |11:11:11
 ij> close c10;
 ij> -- restore t1
 delete from t1;
@@ -615,28 +615,28 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update to row which was subject to searched update
 -- (row becomes outside of cursor qualification)
 get cursor c10a as 'select * from t1 where i = 1 for update';
 ij> next c10a;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 2 where current of c10a;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> close c10a;
 ij> -- restore t1
 delete from t1;
@@ -644,28 +644,28 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update to row which was subject to positioned update
 -- (row becomes outside of cursor qualification)
 get cursor c11 as 'select * from t1 where i = 1 for update';
 ij> next c11;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1 where current of c11;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 2 where current of c11;
 ERROR 24000: Invalid cursor state - no current row.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-2          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+2          |1111111111|1.1E12                  |11:11:11
 ij> close c11;
 ij> -- restore t1
 delete from t1;
@@ -673,30 +673,30 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update to row which was subject to 2 searched updates
 -- (1st puts row outside of cursor qualification, 2nd restores it)
 get cursor c12 as 'select * from t1 where i = 1 for update';
 ij> next c12;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 1;
 1 row inserted/updated/deleted
 ij> update t1 set i = 1;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> update t1 set i = i + 2 where current of c12;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-3          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+3          |1111111111|1.1E12                  |11:11:11
 ij> -- negative test - try to update a non-existant column
 update t1 set notacolumn = i + 1 where current of c12;
 ERROR 42X14: 'NOTACOLUMN' is not a column in table or VTI 'APP.T1'.
@@ -707,9 +707,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update column not in SELECT list, but in FOR UPDATE OF list
 get cursor c13 as 'select i from t1 for update of v';
 ij> next c13;
@@ -719,16 +719,16 @@ I          
 ij> update t1 set v = '999' where current of c13;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |999       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |999       |1.1E12                  |11:11:11
 ij> -- update column not in FOR UPDATE OF list (negative test)
 update t1 set i = 999 where current of c13;
 ERROR 42X31: Column 'I' is not in the FOR UPDATE list of cursor 'C13'.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |999       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |999       |1.1E12                  |11:11:11
 ij> close c13;
 ij> -- restore t1
 delete from t1;
@@ -736,9 +736,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- update a non-referenced column
 get cursor c14 as 'select i from t1 for update';
 ij> next c14;
@@ -748,9 +748,9 @@ I          
 ij> update t1 set v = '999' where current of c14;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |999       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |999       |1.1E12                  |11:11:11
 ij> close c14;
 ij> -- restore t1
 delete from t1;
@@ -758,9 +758,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .update columns in list in order different from the list's
 get cursor c15 as 'select i, v from t1 for update of i, v';
 ij> next c15;
@@ -770,18 +770,18 @@ I          |V         
 ij> update t1 set v = '999', i = 888 where current of c15;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-888        |999       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+888        |999       |1.1E12                  |11:11:11
 ij> -- . show that target table name must be used as qualifier, other names not allowed
 update t1 set t1.v = '998' where current of c15;
 1 row inserted/updated/deleted
 ij> update t1 set t2.v = '997' where current of c15;
 ERROR 42X55: Table name 'T2' should be the same as 'T1'.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-888        |998       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+888        |998       |1.1E12                  |11:11:11
 ij> close c15;
 ij> -- restore t1
 delete from t1;
@@ -789,9 +789,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .update only 1 column in the list
 get cursor c16 as 'select i, v from t1 for update of i, v';
 ij> next c16;
@@ -801,9 +801,9 @@ I          |V         
 ij> update t1 set v = '999' where current of c16;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |999       |1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |999       |1.1E12                  |11:11:11
 ij> close c16;
 ij> -- restore t1
 delete from t1;
@@ -811,9 +811,9 @@ delete from t1;
 ij> insert into t1 select * from t1_copy;
 1 row inserted/updated/deleted
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- .try to update through a closed cursor
 get cursor c17 as 'select i, v from t1 for update of i, v';
 ij> next c17;
@@ -824,9 +824,9 @@ ij> close c17;
 ij> update t1 set v = '999' where current of c17;
 ERROR 42X30: Cursor 'C17' not found. Verify that autocommit is off.
 ij> select * from t1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> -- a positioned update requires a named target table.
 -- if we prepare the positioned update, close the underlying cursor
 -- and reopen it on a different table, then the positioned update
@@ -883,9 +883,9 @@ ij> -- now, reopen c1 on a table without
 -- what happens on an attempted positioned update
 get cursor c1 as 'select * from t1 for update';
 ij> next c1;
-I          |V         |D                     |T       
-------------------------------------------------------
-1          |1111111111|1.1E12                |11:11:11
+I          |V         |D                       |T       
+--------------------------------------------------------
+1          |1111111111|1.1E12                  |11:11:11
 ij> execute u1;
 ERROR 42X29: Update table 'T3' is not the target of cursor 'C1'.
 ij> close c1;
@@ -1188,4 +1188,4 @@ ij> -- clean up
 autocommit on;
 ij> drop table test1;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/select.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/select.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/select.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/select.out Wed Feb 20 04:42:57 2013
@@ -177,10 +177,10 @@ ij> INSERT INTO CONTENT.RATING VALUES(4,
 ij> INSERT INTO CONTENT.RATING VALUES(5, 4.0, 1);
 1 row inserted/updated/deleted
 ij> select S.DESCRIPTION, FAV.MAXRATE, C.TITLE, C.URL FROM CONTENT.RATING R, CONTENT.CONTENT C, CONTENT.STYLE S, CONTENT.CONTENT_STYLE CS, (select S.ID, max(rating) from CONTENT.RATING R, CONTENT.CONTENT C, CONTENT.STYLE S, CONTENT.CONTENT_STYLE CS group by S.ID) AS FAV(FID,MAXRATE) where R.ID = C.ID AND C.ID = CS.CONTENT_ID AND CS.STYLE_ID = FAV.FID AND FAV.FID = S.ID AND FAV.MAXRATE = R.RATING;
-DESCRIPTION                                                                                                                     |MAXRATE               |TITLE                                                                                                                           |URL                                                                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-BIRD                                                                                                                            |4.5                   |title1                                                                                                                          |http://url.1                                                                                                                    
-CAR                                                                                                                             |4.5                   |title1                                                                                                                          |http://url.1                                                                                                                    
+DESCRIPTION                                                                                                                     |MAXRATE                 |TITLE                                                                                                                           |URL                                                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+BIRD                                                                                                                            |4.5                     |title1                                                                                                                          |http://url.1                                                                                                                    
+CAR                                                                                                                             |4.5                     |title1                                                                                                                          |http://url.1                                                                                                                    
 ij> drop table content.rating;
 0 rows inserted/updated/deleted
 ij> drop table content.content_style;
@@ -217,4 +217,4 @@ ij> select SYS."S1.T1".d1 from "S1.T1";
 ERROR 42X04: Column 'SYS.S1.T1.D1' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'SYS.S1.T1.D1' is not a column in the target table.
 ij> select SYS."S1.T1".d1 from "S1.T1" t1;
 ERROR 42X04: Column 'SYS.S1.T1.D1' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'SYS.S1.T1.D1' is not a column in the target table.
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out?rev=1448002&r1=1448001&r2=1448002&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out Wed Feb 20 04:42:57 2013
@@ -140,13 +140,13 @@ ij> insert into allTypes1 values (0, 10,
 					  X'12af', X'0F0F', X'1234', 111.11, 222.2);
 1 row inserted/updated/deleted
 ij> select * from allTypes1;
-I          |TN    |S     |L                   |C         |V                                                 |LVC                                                                                                                             |D                     |R            |F                     |DT        |T       |TS                           |B   |BV  |LBV                                                                                                                             |DC     |N         
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0          |10    |100   |1000000             |duplicate |this is duplicated                                |also duplicated                                                                                                                 |200.0                 |200.0        |200.0                 |1992-01-01|12:30:30|xxxxxxFILTERED-TIMESTAMPxxxxx|12af|0f0f|1234                                                                                                                            |111.11 |222.2000  
+I          |TN    |S     |L                   |C         |V                                                 |LVC                                                                                                                             |D                       |R              |F                       |DT        |T       |TS                           |B   |BV  |LBV                                                                                                                             |DC     |N         
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+0          |10    |100   |1000000             |duplicate |this is duplicated                                |also duplicated                                                                                                                 |200.0                   |200.0          |200.0                   |1992-01-01|12:30:30|xxxxxxFILTERED-TIMESTAMPxxxxx|12af|0f0f|1234                                                                                                                            |111.11 |222.2000  
 ij> select * from allTypes2;
-I          |TN    |S     |L                   |C         |V                                                 |LVC                                                                                                                             |D                     |R            |F                     |DT        |T       |TS                           |B   |BV  |LBV                                                                                                                             |DC     |N         
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-0          |10    |100   |1000000             |duplicate |this is duplicated                                |also duplicated                                                                                                                 |200.0                 |200.0        |200.0                 |1992-01-01|12:30:30|xxxxxxFILTERED-TIMESTAMPxxxxx|12af|0f0f|1234                                                                                                                            |111.11 |222.2000  
+I          |TN    |S     |L                   |C         |V                                                 |LVC                                                                                                                             |D                       |R              |F                       |DT        |T       |TS                           |B   |BV  |LBV                                                                                                                             |DC     |N         
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+0          |10    |100   |1000000             |duplicate |this is duplicated                                |also duplicated                                                                                                                 |200.0                   |200.0          |200.0                   |1992-01-01|12:30:30|xxxxxxFILTERED-TIMESTAMPxxxxx|12af|0f0f|1234                                                                                                                            |111.11 |222.2000  
 ij> commit;
 ij> drop trigger t1;
 0 rows inserted/updated/deleted



Mime
View raw message