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 my...@apache.org on 2014/11/18 23:24:37 UTC
svn commit: r1640439 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/schemas.out tests/lang/schemas.sql
Author: myrnavl
Date: Tue Nov 18 22:24:37 2014
New Revision: 1640439
URL: http://svn.apache.org/r1640439
Log:
DERBY-6772; intermittent test failure in LangScripts schemas
changing the affected query to return the rows in a fixed order.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out?rev=1640439&r1=1640438&r2=1640439&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out Tue Nov 18 22:24:37 2014
@@ -465,17 +465,17 @@ ij> insert into sampletab values (2,'in
1 row inserted/updated/deleted
ij> -- verify it
--
-select schemaname, tablename, descriptor as descr
+select schemaname, tablename, isindex as ind, descriptor as descr
from sys.sysschemas s, sys.sysconglomerates c , sys.systables t
where CAST(t.tablename AS VARCHAR(128)) = 'SAMPLETAB'
and s.schemaid = c.schemaid
and c.tableid = t.tableid
-order by schemaname, tablename;
-SCHEMANAME |TABLENAME |DESCR
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-APP |SAMPLETAB |NULL
-TEST |SAMPLETAB |BTREE (1)
-TEST |SAMPLETAB |NULL
+order by schemaname, tablename, isindex;
+SCHEMANAME |TABLENAME |IND |DESCR
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+APP |SAMPLETAB |false|NULL
+TEST |SAMPLETAB |false|NULL
+TEST |SAMPLETAB |true |BTREE (1)
ij> -- select from both the tables
select * from sampletab;
C1 |C2
@@ -999,4 +999,4 @@ ij> set schema app;
0 rows inserted/updated/deleted
ij> drop schema test restrict;
0 rows inserted/updated/deleted
-ij>
+ij>
\ No newline at end of file
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql?rev=1640439&r1=1640438&r2=1640439&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql Tue Nov 18 22:24:37 2014
@@ -275,12 +275,12 @@ insert into sampletab values (2,'in sche
-- verify it
--
-select schemaname, tablename, descriptor as descr
+select schemaname, tablename, isindex as ind, descriptor as descr
from sys.sysschemas s, sys.sysconglomerates c , sys.systables t
where CAST(t.tablename AS VARCHAR(128)) = 'SAMPLETAB'
and s.schemaid = c.schemaid
and c.tableid = t.tableid
-order by schemaname, tablename;
+order by schemaname, tablename, isindex;
-- select from both the tables
select * from sampletab;