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 2007/02/03 01:22:45 UTC
svn commit: r502808 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ suites/ tests/lang/
Author: djd
Date: Fri Feb 2 16:22:44 2007
New Revision: 502808
URL: http://svn.apache.org/viewvc?view=rev&rev=502808
Log:
Convert fourteen lang sql scripts to run under LangScripts instead of the old harness.
lang/functions.sql
lang/groupBy.sql
lang/identifier.sql
lang/implicitConversions.sql
lang/innerjoin.sql
lang/intersect.sql
lang/joins.sql
lang/logop.sql
lang/miscerrors.sql
lang/modifyColumn.sql
lang/nonreserved.sql
lang/orderby.sql
lang/positionedDelUpd.sql
lang/precedence.sql
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/functions.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/joins.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nonreserved.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/precedence.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/functions.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/functions.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/functions.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/functions.out Fri Feb 2 16:22:44 2007
@@ -15,6 +15,7 @@
-- limitations under the License.
--
-- Test various functions
+
create table alltypes(
id int not null primary key,
smallIntCol smallint,
@@ -436,6 +437,7 @@
ij> -- SYSFUN functions (unqualifed functions are automatically resolved
-- to the in-memory SYSFUN functions if the function does not exist
-- in the current schema.
+
-- SYSFUN math functions
create table SYSFUN_MATH_TEST (d double);
0 rows inserted/updated/deleted
@@ -465,4 +467,4 @@
0 rows inserted/updated/deleted
ij> drop function SYSFUN.ACOS;
ERROR 42X62: 'DROP FUNCTION' is not allowed in the 'SYSFUN' schema.
-ij>
+ij>
\ No newline at end of file
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out Fri Feb 2 16:22:44 2007
@@ -14,7 +14,9 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
+
-- negative tests for group by and having clauses
+
create table t1 (a int, b int, c int);
0 rows inserted/updated/deleted
ij> create table t2 (a int, b int, c int);
@@ -45,6 +47,7 @@
select t2.a, (select b from t1 where t1.b = t2.b) from t1 t2 group by t2.a;
ERROR 42Y30: The SELECT list of a grouped query contains at least one invalid expression. If a SELECT list has a GROUP BY, the list may only contain valid grouping expressions and valid aggregate expressions.
ij> -- having clause
+
-- cannot contain column references which are not grouping columns
select a from t1 group by a having c = 1;
ERROR 42X04: Column 'C' 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 'C' is not a column in the target table.
@@ -66,6 +69,7 @@
ij> drop table unmapped;
0 rows inserted/updated/deleted
ij> -- Test group by and having clauses with no aggregates
+
-- create an all types tables
create table t (i int, s smallint, l bigint,
c char(10), v varchar(50), lvc long varchar,
@@ -94,91 +98,91 @@
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (1, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 200, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 2000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'goodbye', 'everyone is here', 'adios, muchachos',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'noone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
100.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 100.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-09-09'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-09-09'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:55:55'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:55:55'), timestamp('1992-01-01 12:30:30'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:55:55'),
X'12af', X'0f0f', X'ABCD');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'ffff', X'0f0f', X'1234');
1 row inserted/updated/deleted
ij> insert into t values (0, 100, 1000000,
'hello', 'everyone is here', 'what the heck do we care?',
200.0e0, 200.0e0,
- date('1992-01-01'), time('12:30:30'), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx),
+ date('1992-01-01'), time('12:30:30'), timestamp('1992-01-01 12:30:30'),
X'12af', X'ffff', X'ABCD');
1 row inserted/updated/deleted
ij> -- bit maps to Byte[], so can't test for now
@@ -243,8 +247,8 @@
ij> select ts from t group by ts order by ts;
TS
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-xxxxxxFILTERED-TIMESTAMPxxxxx
+1992-01-01 12:30:30.0
+1992-01-01 12:55:55.0
NULL
ij> select b from t group by b order by b;
B
@@ -465,6 +469,7 @@
0 |0
1 |1
ij> -- having
+
-- parameters in having clause
prepare p1 as 'select i, dt, b from t group by i, dt, b having i = ? order by i,dt,b';
ij> execute p1 using 'values 0';
@@ -561,6 +566,7 @@
ij> drop table tab1;
0 rows inserted/updated/deleted
ij> -- negative tests for selects with a having clause without a group by
+
-- create a table
create table t1(c1 int, c2 int);
0 rows inserted/updated/deleted
@@ -581,6 +587,7 @@
0 rows inserted/updated/deleted
ij> -- bug 5653
-- test (almost useful) restrictions on a having clause without a group by clause
+
-- create the table
create table t1 (c1 float);
0 rows inserted/updated/deleted
@@ -636,4 +643,4 @@
10 |2
ij> drop table t;
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/identifier.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out Fri Feb 2 16:22:44 2007
@@ -14,6 +14,7 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
+
--
-- this test is for identifiers and delimited idenifiers
-- identifiers get converted to upper case
@@ -21,6 +22,7 @@
-- any pair of adjacent double quotes is converted to a single double quote
-- max identifier length is 128
--
+
-- trailing blank not trimmed
create table t1(" " int);
0 rows inserted/updated/deleted
@@ -84,6 +86,7 @@
ij> create table idtest2 (i integer, j integer);
0 rows inserted/updated/deleted
ij> -- table
+
create table
asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast6
(c1 int);
@@ -242,8 +245,9 @@
0 rows inserted/updated/deleted
ij> drop procedure "pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp";
0 rows inserted/updated/deleted
-ij> -- xxxxxxFILTERED-TIMESTAMPxxxxx
+ij> -- 2003-04-14 14:04:38
-- new testcases for SQL92 reserved keywords as identifiers
+
CREATE TABLE WHEN (WHEN INT, A INT);
0 rows inserted/updated/deleted
ij> INSERT INTO WHEN (WHEN) VALUES (1);
@@ -438,4 +442,4 @@
ij> -- test10
create table "".""(c1 int);
ERROR 42X01: Syntax error: Encountered "\"" at line 2, column 14.
-ij>
+ij>
\ No newline at end of file
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?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- 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 Fri Feb 2 16:22:44 2007
@@ -17,6 +17,7 @@
-- ** insert implicitConversionsPositive.sql
-- tests for implicit conversions between string and non-string types
-- and vice versa
+
-- create an all types table
create table all1(si smallint, i int, li bigint, r real,
dp double precision, dc decimal(5,1), num numeric(5,1),
@@ -29,7 +30,7 @@
insert into all1 values (2, 3, 4, 5.5, 6.6, 7.7, 8.8,
X'0020', X'0020', X'0020',
date('1996-09-09'), time('12:12:12'),
- timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'),
+ timestamp('1996-09-09 12:12:12.5'),
'1', '2', '33333333');
1 row inserted/updated/deleted
ij> -- unions between string and non-string types
@@ -200,29 +201,29 @@
12:12:12
ij> values cast('11:11:11' as long varchar), time('12:12:12');
ERROR 42X61: Types 'LONG VARCHAR' and 'TIME' are not UNION compatible.
-ij> values timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'), 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> values timestamp('1996-09-09 12:12:12.5'), '1996-08-08 11:11:11.1';
1
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> values timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'), cast('xxxxxxFILTERED-TIMESTAMPxxxxx' as varchar(30));
+1996-09-09 12:12:12.5
+1996-08-08 11:11:11.1
+ij> values timestamp('1996-09-09 12:12:12.5'), cast('1996-08-08 11:11:11.1' as varchar(30));
1
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> values timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'), cast('xxxxxxFILTERED-TIMESTAMPxxxxx' as long varchar);
+1996-09-09 12:12:12.5
+1996-08-08 11:11:11.1
+ij> values timestamp('1996-09-09 12:12:12.5'), cast('1996-08-08 11:11:11.1' as long varchar);
ERROR 42X61: Types 'TIMESTAMP' and 'LONG VARCHAR' are not UNION compatible.
-ij> values 'xxxxxxFILTERED-TIMESTAMPxxxxx', timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values '1996-08-08 11:11:11.1', timestamp('1996-09-09 12:12:12.5');
1
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> values cast('xxxxxxFILTERED-TIMESTAMPxxxxx' as varchar(30)), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+1996-08-08 11:11:11.1
+1996-09-09 12:12:12.5
+ij> values cast('1996-08-08 11:11:11.1' as varchar(30)), timestamp('1996-09-09 12:12:12.5');
1
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> values cast('xxxxxxFILTERED-TIMESTAMPxxxxx' as long varchar), timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+1996-08-08 11:11:11.1
+1996-09-09 12:12:12.5
+ij> values cast('1996-08-08 11:11:11.1' as long varchar), timestamp('1996-09-09 12:12:12.5');
ERROR 42X61: Types 'LONG VARCHAR' and 'TIMESTAMP' are not UNION compatible.
ij> -- comparisons at the language level
select si from all1 where cast(1 as smallint) = '1';
@@ -675,84 +676,84 @@
ij> select 1 from all1 where time('12:13:12') <> cast(null as char);
1
-----------
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' = timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.4' = timestamp('1996-09-09 12:12:12.4');
1
-----------
1
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' > timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.5' > timestamp('1996-09-09 12:12:12.4');
1
-----------
1
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' >= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.5' >= timestamp('1996-09-09 12:12:12.4');
1
-----------
1
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' < timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.5' < timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' <= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.5' <= timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where 'xxxxxxFILTERED-TIMESTAMPxxxxx' <> timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where '1996-09-09 12:12:12.5' <> timestamp('1996-09-09 12:12:12.4');
1
-----------
1
-ij> select 1 from all1 where cast(null as char) = timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) = timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where cast(null as char) > timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) > timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where cast(null as char) >= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) >= timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where cast(null as char) < timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) < timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where cast(null as char) <= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) <= timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where cast(null as char) <> timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select 1 from all1 where cast(null as char) <> timestamp('1996-09-09 12:12:12.4');
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )= 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.4' )= '1996-09-09 12:12:12.4';
1
-----------
1
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )> 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )> '1996-09-09 12:12:12.4';
1
-----------
1
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )>= 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )>= '1996-09-09 12:12:12.4';
1
-----------
1
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )< 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )< '1996-09-09 12:12:12.4';
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<= 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )<= '1996-09-09 12:12:12.4';
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<> 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )<> '1996-09-09 12:12:12.4';
1
-----------
1
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )= cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.4' )= cast(null as char);
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )> cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )> cast(null as char);
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )>= cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )>= cast(null as char);
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )< cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )< cast(null as char);
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<= cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )<= cast(null as char);
1
-----------
-ij> select 1 from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<> cast(null as char);
+ij> select 1 from all1 where timestamp('1996-09-09 12:12:12.5' )<> cast(null as char);
1
-----------
ij> select si from all1 where ' ' = X'0020';
@@ -812,7 +813,7 @@
0 rows inserted/updated/deleted
ij> insert into all_c1 values ('1', '2', '3', '4', '5.5', '6.6', '7.7', '8.8',
'true', ' ', ' ', ' ', '1996-09-09', '12:12:12',
- 'xxxxxxFILTERED-TIMESTAMPxxxxx', '1', '2', '33333333');
+ '1996-09-09 12:12:12.5', '1', '2', '33333333');
1 row inserted/updated/deleted
ij> -- test qualifiers with conversion from (var)char
select 1 from all_c1, all1 where si = c_si;
@@ -2276,7 +2277,7 @@
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|xxxxxxFILTERED-TIMESTAMPxxxxx|1 |2 |33333333 |NULL |NULL |NULL
+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';
@@ -2301,14 +2302,14 @@
1 row inserted/updated/deleted
ij> update all1 set tm = '08:08:08';
1 row inserted/updated/deleted
-ij> update all1 set tms = 'xxxxxxFILTERED-TIMESTAMPxxxxx';
+ij> update all1 set tms = '1990-01-01 08:08:08.6';
1 row inserted/updated/deleted
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|xxxxxxFILTERED-TIMESTAMPxxxxx|1 |2 |44444444 |NULL |NULL |NULL
+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
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -2434,10 +2435,10 @@
1
----------
$10:11:12$
-ij> values '$' || timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )|| '$';
+ij> values '$' || timestamp('1996-09-09 10:11:12.4' )|| '$';
1
----------------------------
-$xxxxxxFILTERED-TIMESTAMPxxxxx$
+$1996-09-09 10:11:12.4$
ij> -- length functions
values length(cast(1 as smallint));
1
@@ -2479,7 +2480,7 @@
1
-----------
3
-ij> values length(timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'));
+ij> values length(timestamp('1996-09-10 10:11:12.4'));
1
-----------
10
@@ -2540,7 +2541,7 @@
0 rows inserted/updated/deleted
ij> insert into t values (CHAR('2000-01-07'),
CHAR('20:06:58'),
- CHAR('xxxxxxFILTERED-TIMESTAMPxxxxx'));
+ CHAR('2000-01-07 20:06:58.9000'));
1 row inserted/updated/deleted
ij> insert into t values (CHAR('2000-1-06'),
CHAR('20:06:57'),
@@ -2568,13 +2569,13 @@
ij> drop table x;
0 rows inserted/updated/deleted
ij> commit;
-ij> disconnect;
ij> -- ** insert implicitConversionsNegative.sql
-- negate tests for implicit conversions
-- to/from (var)char
+
-- union
-connect 'wombat';
-ij> autocommit on;
+
+autocommit on;
ij> values cast(1 as smallint), 'a';
ERROR 42X61: Types 'SMALLINT' and 'CHAR' are not UNION compatible.
ij> values 'a', cast(1 as smallint);
@@ -2633,12 +2634,12 @@
1
--------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'), 'a';
+ij> values timestamp('1996-09-09 11:11:11.5'), 'a';
1
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
+1996-09-09 11:11:11.5
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values 'a', timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values 'a', timestamp('1996-09-09 11:11:11.5');
1
--------------------------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
@@ -2907,29 +2908,29 @@
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
ij> select si from all1 where 'a' <> time('11:11:11');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )= 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )= 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )> 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )> 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )>= 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )>= 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )< 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )< 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<= 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )<= 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx' )<> 'a';
+ij> select si from all1 where timestamp('1996-09-09 11:11:11.4' )<> 'a';
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' = timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' = timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' > timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' > timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' >= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' >= timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' < timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' < timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' <= timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' <= timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> select si from all1 where 'a' <> timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> select si from all1 where 'a' <> timestamp('1996-09-09 11:11:11.4');
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
ij> -- create an all types table
drop table all1;
@@ -2945,7 +2946,7 @@
insert into all1 values (2, 3, 4, 5.5, 6.6, 7.7, 8.8,
X'20', X'20', X'20',
date('1996-09-09'), time('12:12:12'),
- timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'),
+ timestamp('1996-09-09 12:12:12.5'),
'1', '2', '333333333333333333');
1 row inserted/updated/deleted
ij> -- tests for comparisons as qualifiers
@@ -3796,7 +3797,7 @@
ij> -- string does not match default
-- date for year/month/day
-- time for hour/minute/second
-values year( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+values year( '1996-09-10 10:11:12.5');
1
-----------
1996
@@ -3804,7 +3805,7 @@
1
-----------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values month( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values month( '1996-09-10 10:11:12.5');
1
-----------
9
@@ -3812,7 +3813,7 @@
1
-----------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values day( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values day( '1996-09-10 10:11:12.5');
1
-----------
10
@@ -3820,7 +3821,7 @@
1
-----------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values hour( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values hour( '1996-09-10 10:11:12.5');
1
-----------
10
@@ -3828,7 +3829,7 @@
1
-----------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values minute( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values minute( '1996-09-10 10:11:12.5');
1
-----------
11
@@ -3836,7 +3837,7 @@
1
-----------
ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
-ij> values second( 'xxxxxxFILTERED-TIMESTAMPxxxxx');
+ij> values second( '1996-09-10 10:11:12.5');
1
-----------
12
@@ -3898,4 +3899,4 @@
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/innerjoin.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out Fri Feb 2 16:22:44 2007
@@ -16,8 +16,11 @@
--
-- test inner joins
-- (NO NATURAL JOIN)
+
+
autocommit off;
ij> -- create some tables
+
create table t1(c1 int);
0 rows inserted/updated/deleted
ij> create table t2(c1 int);
@@ -34,6 +37,7 @@
ij> insert into t3 values 2, 3, 5, 7;
4 rows inserted/updated/deleted
ij> -- negative tests
+
-- no join clause
select * from t1 join t2;
ERROR 42X01: Syntax error: Encountered "<EOF>" at line 4, column 24.
@@ -67,6 +71,7 @@
ij> select * from t3 where exists (select * from t1 inner join t2 on t3.c1 = t2.c1);
ERROR 42972: An ON clause associated with a JOIN operator is not valid.
ij> -- positive tests
+
select a.c1 from t1 a join t2 b on a.c1 = b.c1;
C1
-----------
@@ -229,4 +234,4 @@
0 rows inserted/updated/deleted
ij> drop table insert_test;
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/joins.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/joins.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/joins.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/joins.out Fri Feb 2 16:22:44 2007
@@ -17,6 +17,7 @@
--
-- this test shows the current supported join functionality
--
+
-- create some tables
create table t1 (t1_c1 int, t1_c2 char(10));
0 rows inserted/updated/deleted
@@ -435,4 +436,4 @@
0 rows inserted/updated/deleted
ij> drop table j1089_dest;
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/logop.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out Fri Feb 2 16:22:44 2007
@@ -17,9 +17,11 @@
--
-- this test is for logical operators (AND, OR, etc.)
--
+
-- create a table. Logical operators work on the results of comparisons,
-- which are tested in a separate test, so the types of the columns being
-- compared are irrelevant here.
+
create table t (x int, y int);
0 rows inserted/updated/deleted
ij> -- insert some values, including nulls
@@ -115,6 +117,7 @@
1 |NULL
ij> -- Test the precedence of AND versus OR. AND is supposed to have a higher
-- precedence that OR, i.e. "a OR b AND c" is equivalent to "a OR (b AND c)"
+
-- First test TRUE OR TRUE AND FALSE. This should evaluate to TRUE. If
-- the precedence is wrong, it will evaluate to FALSE.
select x from s where (1 = 1) or (2 = 2) and (3 = 4);
@@ -129,6 +132,7 @@
1
ij> -- Now test whether parenthesized expressions work. Use the parentheses to
-- force the OR to be evaluated before the AND.
+
select x from s where ( (1 = 1) or (2 = 2) ) and (3 = 4);
X
-----------
@@ -400,4 +404,4 @@
0 rows inserted/updated/deleted
ij> drop table s;
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/miscerrors.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/miscerrors.out Fri Feb 2 16:22:44 2007
@@ -17,12 +17,15 @@
--
-- this test is for miscellaneous errors
--
+
-- lexical error
select @#^%*&! from swearwords;
ERROR 42X02: Lexical error at line 22, column 8. Encountered: "@" (64), after : "".
ij> --
-- try to create duplicate table
--
+
+
create table a (one int);
0 rows inserted/updated/deleted
ij> create table a (one int, two int);
@@ -64,4 +67,4 @@
SQL_TEXT
--------------------------------------------------------------------------------------------------------------------------------
select SQL_TEXT from syscs_diag.statement_cache where SQL_TEXT LIKE '%932432%'
-ij>
+ij>
\ No newline at end of file
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out Fri Feb 2 16:22:44 2007
@@ -14,8 +14,10 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
+
-- Testing changing the length of a column.
-- Also testing the new syntax for generated column spec and identity attribute
+
create table alltypes (i int, tn int, s smallint, l bigint,
c char(10), v varchar(50), lvc long varchar,
nc char(10), nvc varchar(10),
@@ -25,6 +27,7 @@
dc decimal(5,2), n numeric(8,4), o bigint);
0 rows inserted/updated/deleted
ij> -- lets start with negative tests first.
+
alter table alltypes alter c set data type char(20);
ERROR 42Z16: Only columns of type VARCHAR may have their length altered.
ij> alter table alltypes alter b set data type char(4) for bit data;
@@ -173,6 +176,7 @@
ij> -- DERBY-882
-- ALTER TABLE to increase size of varchar could convert a non-null column to nullable
-- before fix for DERBY-882
+
create table a (id integer not null, name varchar(20) not null, primary key(name));
0 rows inserted/updated/deleted
ij> insert into a values (1, 'abc');
@@ -216,4 +220,4 @@
4 |NULL
ij> drop table a;
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/nonreserved.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nonreserved.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nonreserved.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nonreserved.out Fri Feb 2 16:22:44 2007
@@ -16,6 +16,7 @@
--
-- This tests that SQL92 formally reserved words are now unreserved
--
+
-- INTERVAL
create table interval(interval int);
0 rows inserted/updated/deleted
@@ -177,33 +178,33 @@
ij> -- TIMESTAMP
create table timestamp (timestamp timestamp);
0 rows inserted/updated/deleted
-ij> insert into timestamp(timestamp) values (timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx'));
+ij> insert into timestamp(timestamp) values (timestamp('2002-05-22 16:17:34.144'));
1 row inserted/updated/deleted
ij> select timestamp from timestamp;
TIMESTAMP
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> select timestamp( 'xxxxxxFILTERED-TIMESTAMPxxxxx'), timestamp "xxxxxxFILTERED-TIMESTAMPxxxxx" from timestamp;
-1 |xxxxxxFILTERED-TIMESTAMPxxxxx
+2002-05-22 16:17:34.144
+ij> select timestamp( '2003-05-22 16:17:34.144'), timestamp "2003-05-22 16:17:34.144" from timestamp;
+1 |2003-05-22 16:17:34.144
-----------------------------------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx|xxxxxxFILTERED-TIMESTAMPxxxxx
+2003-05-22 16:17:34.144 |2002-05-22 16:17:34.144
ij> select timestamp timestamp from timestamp;
TIMESTAMP
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
+2002-05-22 16:17:34.144
ij> select timestamp as timestamp from timestamp;
TIMESTAMP
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
+2002-05-22 16:17:34.144
ij> select timestamp.timestamp as timestamp from timestamp timestamp;
TIMESTAMP
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
+2002-05-22 16:17:34.144
ij> select timestamp.timestamp as timestamp from timestamp as timestamp;
TIMESTAMP
--------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx
-ij> delete from timestamp where timestamp = timestamp('xxxxxxFILTERED-TIMESTAMPxxxxx');
+2002-05-22 16:17:34.144
+ij> delete from timestamp where timestamp = timestamp('2002-05-22 16:17:34.144');
1 row inserted/updated/deleted
ij> create index timestamp on timestamp(timestamp);
0 rows inserted/updated/deleted
@@ -471,4 +472,4 @@
ERROR 42903: Invalid use of an aggregate function.
ij> drop table t1;
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/orderby.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- 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 Fri Feb 2 16:22:44 2007
@@ -16,6 +16,7 @@
--
-- order by tests
-- in V52, we allow "select a from t order by b" where the ORDERBY column doesn't necessarily appear in the SELECT list.
+
autocommit off;
ij> -- . order by on values
values (1,0,1),(1,0,0),(0,0,1),(0,1,0) order by 1,2,3;
@@ -581,6 +582,7 @@
3 |hello
NULL |NULL
ij> -- . redundant order by on index scan (later)
+
-- rollback should release the prepared statements
rollback ;
ij> -- . order by with empty source, nulls in source, etc.
@@ -636,13 +638,13 @@
ij> -- . order by on all data types
create table missed (s smallint, r real, d date, t time, ts timestamp, c char(10), l bigint);
0 rows inserted/updated/deleted
-ij> insert into missed values (1,1.2e4, '1992-01-01','23:01:01', 'xxxxxxFILTERED-TIMESTAMPxxxxx', 'theend', 2222222222222);
+ij> insert into missed values (1,1.2e4, '1992-01-01','23:01:01', '1993-02-04 12:02:00.001', 'theend', 2222222222222);
1 row inserted/updated/deleted
-ij> insert into missed values (1,1.2e4, '1992-01-01', '23:01:01', 'xxxxxxFILTERED-TIMESTAMPxxxxx', 'theend', 3333333333333);
+ij> insert into missed values (1,1.2e4, '1992-01-01', '23:01:01', '1993-02-04 12:02:00.001', 'theend', 3333333333333);
1 row inserted/updated/deleted
-ij> insert into missed values (2,1.0e4, '1992-01-01', '20:01:01', 'xxxxxxFILTERED-TIMESTAMPxxxxx', 'theend', 4444444444444);
+ij> insert into missed values (2,1.0e4, '1992-01-01', '20:01:01', '1997-02-04 12:02:00.001', 'theend', 4444444444444);
1 row inserted/updated/deleted
-ij> insert into missed values (2,1.0e4, '1992-01-01', '20:01:01', 'xxxxxxFILTERED-TIMESTAMPxxxxx', null, 2222222222222);
+ij> insert into missed values (2,1.0e4, '1992-01-01', '20:01:01', '1997-02-04 12:02:00.001', null, 2222222222222);
1 row inserted/updated/deleted
ij> select s from missed order by s;
S
@@ -668,10 +670,10 @@
ij> select ts,t from missed order by ts desc, t;
TS |T
-----------------------------------
-xxxxxxFILTERED-TIMESTAMPxxxxx|20:01:01
-xxxxxxFILTERED-TIMESTAMPxxxxx|20:01:01
-xxxxxxFILTERED-TIMESTAMPxxxxx|23:01:01
-xxxxxxFILTERED-TIMESTAMPxxxxx|23:01:01
+1997-02-04 12:02:00.001 |20:01:01
+1997-02-04 12:02:00.001 |20:01:01
+1993-02-04 12:02:00.001 |23:01:01
+1993-02-04 12:02:00.001 |23:01:01
ij> select l from missed order by l;
L
--------------------
@@ -755,15 +757,15 @@
ts timestamp,
dc decimal(2,1));
0 rows inserted/updated/deleted
-ij> insert into tab1 values (1, cast(1 as int), cast(1 as smallint), cast(1 as bigint), '1', '1', '1', cast(1.1 as double precision), cast(1.1 as real), '1996-01-01', '11:11:11','xxxxxxFILTERED-TIMESTAMPxxxxx', cast(1.1 as decimal(2,1)));
+ij> insert into tab1 values (1, cast(1 as int), cast(1 as smallint), cast(1 as bigint), '1', '1', '1', cast(1.1 as double precision), cast(1.1 as real), '1996-01-01', '11:11:11','1996-01-01 11:10:10.1', cast(1.1 as decimal(2,1)));
1 row inserted/updated/deleted
-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', 'xxxxxxFILTERED-TIMESTAMPxxxxx', cast(2.2 as decimal(2,1)));
+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|xxxxxxFILTERED-TIMESTAMPxxxxx|1.1
-2 |2 |2 |2 |2 |2 |2 |2.2 |2.2 |1995-02-02|12:12:12|xxxxxxFILTERED-TIMESTAMPxxxxx|2.2
+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);
@@ -910,6 +912,7 @@
3 |NULL
0 |NULL
ij> --Test addtive expression in order clause
+
create table test_word(value varchar(32));
0 rows inserted/updated/deleted
ij> insert into test_word(value) values('anaconda');
@@ -1336,6 +1339,7 @@
-- then order by it, so long as the multiple columns truly are equivalent.
-- There are a few cases where there truly is an ambiguity, and in those
-- cases we reject the ORDER BY clause.
+
create table derby147 (a int, b int, c int, d int);
0 rows inserted/updated/deleted
ij> insert into derby147 values (1, 2, 3, 4);
@@ -1436,4 +1440,4 @@
-----------------------
1 |2
40 |40
-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?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- 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 Fri Feb 2 16:22:44 2007
@@ -19,10 +19,13 @@
-- tests for positioned delete
--
-- note that comments that begin '-- .' are test cases from the test plan
+
-- assumed available in queries at time of initial writing:
-- subqueries. Additional tests will be needed once we have:
-- order by, group by, having, aggregates, distinct, views ...
+
-- setup some tables for use in the tests
+
create table t1 ( i int, v varchar(10), d double precision, t time );
0 rows inserted/updated/deleted
ij> create table t1_copy ( i int, v varchar(10), d double precision, t time );
@@ -38,6 +41,7 @@
-- the positioned statements against them.
autocommit off;
ij> -- empty table tests
+
-- .no table name given
-- this should fail with a syntax error
delete;
@@ -57,6 +61,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -146,6 +151,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -175,6 +181,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -198,6 +205,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -226,6 +234,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -314,6 +323,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -394,10 +404,13 @@
-- tests for positioned update
--
-- note that comments that begin '-- .' are test cases from the test plan
+
-- assumed available in queries at time of initial writing:
-- subqueries. Additional tests will be needed once we have:
-- order by, group by, having, aggregates, distinct, views ...
+
-- setup some tables for use in the tests
+
create table t1 ( i int, v varchar(10), d double precision, t time );
0 rows inserted/updated/deleted
ij> create table t1_copy ( i int, v varchar(10), d double precision, t time );
@@ -413,6 +426,7 @@
-- the positioned statements against them.
autocommit off;
ij> -- empty table tests
+
-- .no table name given
-- this should fail with a syntax error
update set c1 = c1;
@@ -538,6 +552,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -561,6 +576,7 @@
ij> -- restore t1
delete from t1;
0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
ij> insert into t1 select * from t1_copy;
1 row inserted/updated/deleted
ij> select * from t1;
@@ -809,6 +825,7 @@
-- if we prepare the positioned update, close the underlying cursor
-- and reopen it on a different table, then the positioned update
-- should fail
+
create table t3(c1 int, c2 int);
0 rows inserted/updated/deleted
ij> insert into t3 values (1,1), (2, 1), (3,3);
@@ -1136,6 +1153,7 @@
0 rows inserted/updated/deleted
ij> --drop schema ejb restrict; - can't drop this because it will fail SPS tests since
--statements are created and would need to be dropped
+
-- test correlation on select in current of cursor in current schema
-- this was also broken
create table test1
@@ -1164,4 +1182,4 @@
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/precedence.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/precedence.out?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/precedence.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/precedence.out Fri Feb 2 16:22:44 2007
@@ -14,9 +14,13 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
+
-- this tests precedence of operators.
+
+
-- test precedence of operators other than and, or, and not
-- that return boolean.
+
-- expect 'true' row:
create table t1(c11 int);
0 rows inserted/updated/deleted
@@ -36,4 +40,4 @@
ij> --
select c11 from t1 where exists(select * from (values 1) as t) not in (1=2);
ERROR 42X01: Syntax error: Encountered "=" at line 2, column 73.
-ij>
+ij>
\ No newline at end of file
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall Fri Feb 2 16:22:44 2007
@@ -46,44 +46,30 @@
lang/fk_nonSPS.sql
lang/forbitdata.java
lang/forupdate.sql
-lang/functions.sql
lang/grantRevokeDDL.sql
lang/grantRevokeDDL2.sql
lang/grantRevoke.java
-lang/groupBy.sql
lang/holdCursorIJ.sql
lang/holdCursorJavaReflection.java
-lang/identifier.sql
-lang/implicitConversions.sql
lang/inbetween.sql
lang/infostreams.sql
-lang/innerjoin.sql
-lang/intersect.sql
lang/isolationLevels.sql
lang/JitTest.java
lang/joinDeadlock.sql
-lang/joins.sql
lang/langUnitTests.sql
lang/lockTable.sql
lang/logStream.java
-lang/logop.sql
lang/lojreorder.sql
lang/longStringColumn.java
lang/maxMemPerTab.java
-lang/miscerrors.sql
-lang/modifyColumn.sql
lang/nestedCommit.sql
-lang/nonreserved.sql
lang/openScans.sql
lang/optimizerOverrides.sql
-lang/orderby.sql
lang/orderbyElimination.sql
lang/outerjoin.sql
lang/outparams.java
lang/paramij.sql
lang/partdml.sql
-lang/positionedDelUpd.sql
-lang/precedence.sql
lang/predicatePushdown.sql
lang/predicatesIntoViews.sql
lang/primarykey.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java Fri Feb 2 16:22:44 2007
@@ -74,7 +74,21 @@
"depend",
"ejbql",
"floattypes",
+ "functions",
+ "groupBy",
+ "identifier",
+ "implicitConversions",
+ "innerjoin",
"insert",
+ "intersect",
+ "joins",
+ "logop",
+ "miscerrors",
+ "modifyColumn",
+ "nonreserved",
+ "orderby",
+ "positionedDelUpd",
+ "precedence",
"refActions1",
"schemas",
"select",
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql?view=diff&rev=502808&r1=502807&r2=502808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/implicitConversions.sql Fri Feb 2 16:22:44 2007
@@ -1163,13 +1163,13 @@
drop table t;
drop table x;
commit;
-disconnect;
+
-- ** insert implicitConversionsNegative.sql
-- negate tests for implicit conversions
-- to/from (var)char
-- union
-connect 'wombat';
+
autocommit on;
values cast(1 as smallint), 'a';
values 'a', cast(1 as smallint);