db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r366629 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/j9_foundation/ tests/store/
Date Sat, 07 Jan 2006 02:05:06 GMT
Author: kmarsden
Date: Fri Jan  6 18:04:57 2006
New Revision: 366629

URL: http://svn.apache.org/viewcvs?rev=366629&view=rev
Log:
* updated masters for jdbcapi/metadata.java,
jdbcapi/odbc_metadata.java for j9_foundation.
* changes to OnlineBackupTest to run with j9 vms.

Contributed by Deepa Remesh


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3_app.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
Fri Jan  6 18:04:57 2006
@@ -40,6 +40,16 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
+getUDTs() with user-named types null :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('JAVA_OBJECT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('STRUCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('DISTINCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('JAVA_OBJECT', 'STRUCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
 allProceduresAreCallable(): true
 getUserName(): APP
 isReadOnly(): false
@@ -151,6 +161,20 @@
 supportsDataManipulationTransactionsOnly(): false
 dataDefinitionCausesTransactionCommit(): false
 dataDefinitionIgnoredInTransactions(): false
+Test the metadata calls related to visibility of changes made by others for different resultset
types
+Since Derby materializes a forward only ResultSet incrementally, it is possible to see changes
+made by others and hence following 3 metadata calls will return true for forward only ResultSets.
+othersUpdatesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+othersDeletesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+othersInsertsAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+Scroll insensitive ResultSet by their definition do not see changes made by others and hence
following metadata calls return false
+othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+othersDeletesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+othersInsertsAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+Derby does not yet implement scroll sensitive resultsets and hence following metadata calls
return false
+othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+othersDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+othersInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 getConnection(): same connection
 getProcedureColumns():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],PRECISION[INTEGER],LENGTH[INTEGER],SCALE[SMALLINT],RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
@@ -177,6 +201,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -184,9 +209,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -195,6 +223,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -202,9 +231,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -419,6 +451,119 @@
 ,SYS,SYSTABLES,TABLETYPE,1,CHAR,1,null,null,null,0,,null,null,null,2,3,NO
 ,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,null,null,null,0,,null,null,null,72,4,NO
 ,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,null,null,null,0,,null,null,null,2,5,NO
+Test escaped numeric functions - JDBC 3.0 C.1
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 
+Executing VALUES { fn MOD(124, 7) } --   = >5<  << 
+Executing VALUES { fn SQRT(6.22) } --   = >2.49<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ACOS(1.34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
+Executing VALUES { fn ASIN(1.21) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
+Executing VALUES { fn ATAN(0.34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
+Executing VALUES { fn ATAN2(0.56, 1.2) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
+Executing VALUES { fn CEILING(3.45) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
+Executing VALUES { fn COS(1.2) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
+Executing VALUES { fn COT(3.4) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
+Executing VALUES { fn DEGREES(2.1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
+Executing VALUES { fn EXP(2.3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
+Executing VALUES { fn FLOOR(3.22) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
+Executing VALUES { fn LOG(34.1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
+Executing VALUES { fn LOG10(18.7) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
+Executing VALUES { fn PI() } -- 
+SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
+Executing VALUES { fn POWER(2, 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
+Executing VALUES { fn RADIANS(54) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
+Executing VALUES { fn RAND(17) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
+Executing VALUES { fn ROUND(345.345, 1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
+Executing VALUES { fn SIGN(-34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
+Executing VALUES { fn SIN(0.32) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
+Executing VALUES { fn TAN(0.57) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
+Executing VALUES { fn TRUNCATE(345.395, 1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
+Test escaped string functions - JDBC 3.0 C.2
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn CONCAT('hello', 'there') } --   = >hellothere<  << 
+Executing VALUES { fn LENGTH('four    ') } --   = >4<  << 
+Executing VALUES { fn LCASE('Fernando Alonso') } --   = >fernando alonso<  <<

+Executing VALUES { fn LOCATE('jour', 'Bonjour') } --   = >4<  << 
+Executing VALUES { fn LTRIM('   left trim   ') } --   = >left trim   <  << 
+Executing VALUES { fn RTRIM('  right trim   ') } --   = >  right trim<  << 
+Executing VALUES { fn SUBSTRING('Ruby the Rubicon Jeep', 10, 7) } --   = >Rubicon<
 << 
+Executing VALUES { fn UCASE('Fernando Alonso') } --   = >FERNANDO ALONSO<  <<

+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ASCII('Yellow') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ASCII" at line 1, column 13.
+Executing VALUES { fn CHAR(65) } --   = >65         <  << 
+FAIL function works but not declared in list: CHAR
+Executing VALUES { fn DIFFERENCE('Pires', 'Piers') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DIFFERENCE" at line 1, column 13.
+Executing VALUES { fn INSERT('Bill Clinton', 4, 'William') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "INSERT" at line 1, column 13.
+Executing VALUES { fn LEFT('Bonjour', 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LEFT" at line 1, column 13.
+Executing VALUES { fn REPEAT('echo', 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "REPEAT" at line 1, column 13.
+Executing VALUES { fn REPLACE('to be or not to be', 'be', 'England') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "REPLACE" at line 1, column 13.
+Executing VALUES { fn SOUNDEX('Derby') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SOUNDEX" at line 1, column 13.
+Executing VALUES { fn SPACE(12) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SPACE" at line 1, column 13.
+Test escaped date time functions - JDBC 3.0 C.3
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES CASE WHEN { fn CURDATE()} = CURRENT_DATE THEN 'OK' ELSE 'wrong' END -- 
 = >OK<  << 
+Executing VALUES CASE WHEN { fn CURTIME()} = CURRENT_TIME THEN 'OK' ELSE 'wrong' END -- 
 = >OK<  << 
+Executing VALUES { fn HOUR({t '16:13:03'}) } --   = >16<  << 
+Executing VALUES { fn MINUTE({t '16:13:03'}) } --   = >13<  << 
+Executing VALUES { fn MONTH({d '1995-12-19'}) } --   = >12<  << 
+Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) }
--   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts
'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
+Executing VALUES { fn YEAR({d '1995-12-19'}) } --   = >1995<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn DAYNAME({d '1995-12-19'h}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYNAME" at line 1, column 13.
+Executing VALUES { fn DAYOFMONTH({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFMONTH" at line 1, column 13.
+Executing VALUES { fn DAYOFWEEK({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFWEEK" at line 1, column 13.
+Executing VALUES { fn DAYOFYEAR({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFYEAR" at line 1, column 13.
+Executing VALUES { fn MONTHNAME({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "MONTHNAME" at line 1, column 13.
+Executing VALUES CASE WHEN { fn NOW()} = CURRENT_TIMESTAMP THEN 'OK' ELSE 'wrong' END --

+SQLSTATE(42X01): Syntax error: Encountered "NOW" at line 1, column 23.
+Executing VALUES { fn QUARTER({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "QUARTER" at line 1, column 13.
+Executing VALUES { fn WEEK({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "WEEK" at line 1, column 13.
+Test escaped system functions - JDBC 3.0 C.4
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn USER() } --   = >APP<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn DATABASE() } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DATABASE" at line 1, column 13.
+Executing VALUES { fn IFNULL('this', 'that') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "IFNULL" at line 1, column 13.
 ---------------------------------------
 Referential action values
 RESTRICT = 1

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/odbc_metadata.out?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/odbc_metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/odbc_metadata.out
Fri Jan  6 18:04:57 2006
@@ -70,6 +70,16 @@
 ,APP,GETPCTEST4A,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a,1
 ,APP,GETPCTEST4B,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
 ,APP,GETPCTEST4BX,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b,1
+getUDTs() with user-named types null :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('JAVA_OBJECT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('STRUCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('DISTINCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
+getUDTs() with user-named types in ('JAVA_OBJECT', 'STRUCT') :
+TYPE_CAT[CHAR],TYPE_SCHEM[CHAR],TYPE_NAME[VARCHAR],CLASS_NAME[LONG VARCHAR],DATA_TYPE[INTEGER],REMARKS[CHAR]
 allProceduresAreCallable(): true
 getUserName(): APP
 isReadOnly(): false
@@ -181,6 +191,20 @@
 supportsDataManipulationTransactionsOnly(): false
 dataDefinitionCausesTransactionCommit(): false
 dataDefinitionIgnoredInTransactions(): false
+Test the metadata calls related to visibility of changes made by others for different resultset
types
+Since Derby materializes a forward only ResultSet incrementally, it is possible to see changes
+made by others and hence following 3 metadata calls will return true for forward only ResultSets.
+othersUpdatesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+othersDeletesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+othersInsertsAreVisible(ResultSet.TYPE_FORWARD_ONLY)? true
+Scroll insensitive ResultSet by their definition do not see changes made by others and hence
following metadata calls return false
+othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+othersDeletesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+othersInsertsAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+Derby does not yet implement scroll sensitive resultsets and hence following metadata calls
return false
+othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+othersDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+othersInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 getConnection(): same connection
 getProcedureColumns():
 PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],COLUMN_NAME[VARCHAR],COLUMN_TYPE[SMALLINT],DATA_TYPE[SMALLINT],TYPE_NAME[VARCHAR],COLUMN_SIZE[INTEGER],BUFFER_LENGTH[INTEGER],DECIMAL_DIGITS[SMALLINT],NUM_PREC_RADIX[SMALLINT],NULLABLE[SMALLINT],REMARKS[VARCHAR],COLUMN_DEF[VARCHAR],SQL_DATA_TYPE[SMALLINT],SQL_DATETIME_SUB[SMALLINT],CHAR_OCTET_LENGTH[INTEGER],ORDINAL_POSITION[INTEGER],IS_NULLABLE[VARCHAR],METHOD_ID[SMALLINT],PARAMETER_ID[SMALLINT]
@@ -207,6 +231,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -214,9 +239,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -225,6 +253,7 @@
 TABLE_CAT[VARCHAR],TABLE_SCHEM[VARCHAR],TABLE_NAME[VARCHAR],TABLE_TYPE[VARCHAR],REMARKS[VARCHAR]
 ,SYS,SYSALIASES,SYSTEM TABLE,
 ,SYS,SYSCHECKS,SYSTEM TABLE,
+,SYS,SYSCOLPERMS,SYSTEM TABLE,
 ,SYS,SYSCOLUMNS,SYSTEM TABLE,
 ,SYS,SYSCONGLOMERATES,SYSTEM TABLE,
 ,SYS,SYSCONSTRAINTS,SYSTEM TABLE,
@@ -232,9 +261,12 @@
 ,SYS,SYSFILES,SYSTEM TABLE,
 ,SYS,SYSFOREIGNKEYS,SYSTEM TABLE,
 ,SYS,SYSKEYS,SYSTEM TABLE,
+,SYS,SYSREQUIREDPERM,SYSTEM TABLE,
+,SYS,SYSROUTINEPERMS,SYSTEM TABLE,
 ,SYS,SYSSCHEMAS,SYSTEM TABLE,
 ,SYS,SYSSTATEMENTS,SYSTEM TABLE,
 ,SYS,SYSSTATISTICS,SYSTEM TABLE,
+,SYS,SYSTABLEPERMS,SYSTEM TABLE,
 ,SYS,SYSTABLES,SYSTEM TABLE,
 ,SYS,SYSTRIGGERS,SYSTEM TABLE,
 ,SYS,SYSVIEWS,SYSTEM TABLE,
@@ -450,6 +482,119 @@
 ,SYS,SYSTABLES,SCHEMAID,1,CHAR,36,72,null,null,0,,null,1,null,72,4,NO
 ,SYS,SYSTABLES,LOCKGRANULARITY,1,CHAR,1,2,null,null,0,,null,1,null,2,5,NO
 OK -- user result set closed by intervening OBDC getColumns request; this was expected because
of the way the test works.
+Test escaped numeric functions - JDBC 3.0 C.1
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ABS(-25.67) } --   = >25.67<  << 
+Executing VALUES { fn MOD(124, 7) } --   = >5<  << 
+Executing VALUES { fn SQRT(6.22) } --   = >2.49<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ACOS(1.34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
+Executing VALUES { fn ASIN(1.21) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
+Executing VALUES { fn ATAN(0.34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
+Executing VALUES { fn ATAN2(0.56, 1.2) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
+Executing VALUES { fn CEILING(3.45) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
+Executing VALUES { fn COS(1.2) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
+Executing VALUES { fn COT(3.4) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
+Executing VALUES { fn DEGREES(2.1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
+Executing VALUES { fn EXP(2.3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
+Executing VALUES { fn FLOOR(3.22) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
+Executing VALUES { fn LOG(34.1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
+Executing VALUES { fn LOG10(18.7) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
+Executing VALUES { fn PI() } -- 
+SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
+Executing VALUES { fn POWER(2, 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
+Executing VALUES { fn RADIANS(54) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
+Executing VALUES { fn RAND(17) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
+Executing VALUES { fn ROUND(345.345, 1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
+Executing VALUES { fn SIGN(-34) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
+Executing VALUES { fn SIN(0.32) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
+Executing VALUES { fn TAN(0.57) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
+Executing VALUES { fn TRUNCATE(345.395, 1) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
+Test escaped string functions - JDBC 3.0 C.2
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn CONCAT('hello', 'there') } --   = >hellothere<  << 
+Executing VALUES { fn LENGTH('four    ') } --   = >4<  << 
+Executing VALUES { fn LCASE('Fernando Alonso') } --   = >fernando alonso<  <<

+Executing VALUES { fn LOCATE('jour', 'Bonjour') } --   = >4<  << 
+Executing VALUES { fn LTRIM('   left trim   ') } --   = >left trim   <  << 
+Executing VALUES { fn RTRIM('  right trim   ') } --   = >  right trim<  << 
+Executing VALUES { fn SUBSTRING('Ruby the Rubicon Jeep', 10, 7) } --   = >Rubicon<
 << 
+Executing VALUES { fn UCASE('Fernando Alonso') } --   = >FERNANDO ALONSO<  <<

+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn ASCII('Yellow') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "ASCII" at line 1, column 13.
+Executing VALUES { fn CHAR(65) } --   = >65         <  << 
+FAIL function works but not declared in list: CHAR
+Executing VALUES { fn DIFFERENCE('Pires', 'Piers') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DIFFERENCE" at line 1, column 13.
+Executing VALUES { fn INSERT('Bill Clinton', 4, 'William') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "INSERT" at line 1, column 13.
+Executing VALUES { fn LEFT('Bonjour', 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "LEFT" at line 1, column 13.
+Executing VALUES { fn REPEAT('echo', 3) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "REPEAT" at line 1, column 13.
+Executing VALUES { fn REPLACE('to be or not to be', 'be', 'England') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "REPLACE" at line 1, column 13.
+Executing VALUES { fn SOUNDEX('Derby') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SOUNDEX" at line 1, column 13.
+Executing VALUES { fn SPACE(12) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "SPACE" at line 1, column 13.
+Test escaped date time functions - JDBC 3.0 C.3
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES CASE WHEN { fn CURDATE()} = CURRENT_DATE THEN 'OK' ELSE 'wrong' END -- 
 = >OK<  << 
+Executing VALUES CASE WHEN { fn CURTIME()} = CURRENT_TIME THEN 'OK' ELSE 'wrong' END -- 
 = >OK<  << 
+Executing VALUES { fn HOUR({t '16:13:03'}) } --   = >16<  << 
+Executing VALUES { fn MINUTE({t '16:13:03'}) } --   = >13<  << 
+Executing VALUES { fn MONTH({d '1995-12-19'}) } --   = >12<  << 
+Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) }
--   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts
'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
+Executing VALUES { fn YEAR({d '1995-12-19'}) } --   = >1995<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn DAYNAME({d '1995-12-19'h}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYNAME" at line 1, column 13.
+Executing VALUES { fn DAYOFMONTH({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFMONTH" at line 1, column 13.
+Executing VALUES { fn DAYOFWEEK({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFWEEK" at line 1, column 13.
+Executing VALUES { fn DAYOFYEAR({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DAYOFYEAR" at line 1, column 13.
+Executing VALUES { fn MONTHNAME({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "MONTHNAME" at line 1, column 13.
+Executing VALUES CASE WHEN { fn NOW()} = CURRENT_TIMESTAMP THEN 'OK' ELSE 'wrong' END --

+SQLSTATE(42X01): Syntax error: Encountered "NOW" at line 1, column 23.
+Executing VALUES { fn QUARTER({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "QUARTER" at line 1, column 13.
+Executing VALUES { fn WEEK({d '1995-12-19'}) } -- 
+SQLSTATE(42X01): Syntax error: Encountered "WEEK" at line 1, column 13.
+Test escaped system functions - JDBC 3.0 C.4
+TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn USER() } --   = >APP<  << 
+TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
+Executing VALUES { fn DATABASE() } -- 
+SQLSTATE(42X01): Syntax error: Encountered "DATABASE" at line 1, column 13.
+Executing VALUES { fn IFNULL('this', 'that') } -- 
+SQLSTATE(42X01): Syntax error: Encountered "IFNULL" at line 1, column 13.
 ---------------------------------------
 Referential action values
 RESTRICT = 1

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
Fri Jan  6 18:04:57 2006
@@ -21,6 +21,7 @@
 package org.apache.derbyTesting.functionTests.tests.store;
 import java.sql.Connection;
 import java.sql.CallableStatement;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
@@ -171,10 +172,16 @@
                                      String connAttrs) 
         throws SQLException 
     {
-        Properties prop = new Properties();
-        prop.setProperty("databaseName", databaseName);
-        prop.setProperty("connectionAttributes", connAttrs);
-        Connection conn = TestUtil.getDataSourceConnection(prop);
+    	Connection conn;
+    	if(TestUtil.HAVE_DRIVER_CLASS)
+			conn = DriverManager.getConnection("jdbc:derby:" + databaseName 
+												+ ";" + connAttrs );
+    	else {
+	    	Properties prop = new Properties();
+	        prop.setProperty("databaseName", databaseName);
+	        prop.setProperty("connectionAttributes", connAttrs);
+	        conn = TestUtil.getDataSourceConnection(prop);
+    	}
         return conn;
     }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
Fri Jan  6 18:04:57 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.store;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.Statement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -160,8 +161,11 @@
 	void shutdown(String dbName) {
 
 		try{
-			// shutdown 
-            TestUtil.shutdownUsingDataSource(TEST_DATABASE_NAME);
+			//shutdown
+			if(TestUtil.HAVE_DRIVER_CLASS)
+				DriverManager.getConnection("jdbc:derby:" + dbName + ";shutdown=true");
+			else 
+				TestUtil.shutdownUsingDataSource(dbName);
 		}catch(SQLException se){
 			if (se.getSQLState() != null && se.getSQLState().equals("08006"))
 				System.out.println("database shutdown properly");
@@ -175,9 +179,14 @@
      */
     Connection getConnection() throws SQLException 
     {
-        Properties prop = new Properties();
-        prop.setProperty("databaseName", TEST_DATABASE_NAME);
-        Connection conn = TestUtil.getDataSourceConnection(prop);
+    	Connection conn;
+    	if(TestUtil.HAVE_DRIVER_CLASS)
+			conn = DriverManager.getConnection("jdbc:derby:" + TEST_DATABASE_NAME );
+    	else {
+	    	Properties prop = new Properties();
+	        prop.setProperty("databaseName", TEST_DATABASE_NAME);
+	        conn = TestUtil.getDataSourceConnection(prop);
+    	}
         return conn;
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1_app.properties?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1_app.properties
Fri Jan  6 18:04:57 2006
@@ -14,8 +14,5 @@
 usedefaults=true
 useextdirs=true
 
-#Exclude for J2ME/Foundation - test requires java.sql.DriverManager
-runwithfoundation=false
-
 #exclude with SecurityManager DERBY-709
 noSecurityManager=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
Fri Jan  6 18:04:57 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.store;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.Statement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -104,8 +105,11 @@
 	void shutdown(String dbName) {
 
 		try{
-			// shutdown 
-            TestUtil.shutdownUsingDataSource(TEST_DATABASE_NAME);
+			//shutdown
+			if(TestUtil.HAVE_DRIVER_CLASS)
+				DriverManager.getConnection("jdbc:derby:" + dbName + ";shutdown=true");
+			else 
+				TestUtil.shutdownUsingDataSource(dbName);
 		}catch(SQLException se){
 			if (se.getSQLState() != null && se.getSQLState().equals("08006"))
 				System.out.println("database shutdown properly");
@@ -119,9 +123,14 @@
      */
     Connection getConnection() throws SQLException 
     {
-        Properties prop = new Properties();
-        prop.setProperty("databaseName", TEST_DATABASE_NAME);
-        Connection conn = TestUtil.getDataSourceConnection(prop);
+    	Connection conn;
+    	if(TestUtil.HAVE_DRIVER_CLASS)
+			conn = DriverManager.getConnection("jdbc:derby:" + TEST_DATABASE_NAME );
+    	else {
+	    	Properties prop = new Properties();
+	        prop.setProperty("databaseName", TEST_DATABASE_NAME);
+	        conn = TestUtil.getDataSourceConnection(prop);
+    	}
         return conn;
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3_app.properties?rev=366629&r1=366628&r2=366629&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3_app.properties
Fri Jan  6 18:04:57 2006
@@ -15,7 +15,7 @@
 useextdirs=true
 supportfiles=tests/store/brtestjar.jar,tests/store/obtest_customer.jar
 
-#Exclude for J2ME/Foundation - test requires java.sql.DriverManager
+#Exclude for J2ME/Foundation - test uses procedure with server-side JDBC
 runwithfoundation=false
 
 #exclude with SecurityManager DERBY-709



Mime
View raw message