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 km...@apache.org on 2008/10/21 20:51:18 UTC
svn commit: r706720 - in /db/derby/code/branches/10.1/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/function...

Author: kmarsden
Date: Tue Oct 21 11:51:13 2008
New Revision: 706720

URL: http://svn.apache.org/viewvc?rev=706720&view=rev
Log:
DERBY-876  DatabaseMetaData.getSchemas() is not JDBC 3.0 compliant
Added missing column to the result set returned by
DatabaseMetaData.getSchemas(). 


Modified:
    db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/metadata.properties
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out

Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/metadata.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/metadata.properties?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/metadata.properties (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/jdbc/metadata.properties Tue Oct 21 11:51:13 2008
@@ -56,7 +56,8 @@
 # getSchemas
 #
 getSchemas=\
-	SELECT SCHEMANAME AS TABLE_SCHEM \
+	SELECT SCHEMANAME AS TABLE_SCHEM, \
+	CAST(NULL AS VARCHAR(128)) AS TABLE_CATALOG \
 	FROM SYS.SYSSCHEMAS \
 	ORDER BY TABLE_SCHEM
 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Tue Oct 21 11:51:13 2008
@@ -14,18 +14,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Tue Oct 21 11:51:13 2008
@@ -44,18 +44,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Tue Oct 21 11:51:13 2008
@@ -14,18 +14,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Tue Oct 21 11:51:13 2008
@@ -44,18 +44,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Tue Oct 21 11:51:13 2008
@@ -14,18 +14,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=706720&r1=706719&r2=706720&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Tue Oct 21 11:51:13 2008
@@ -44,18 +44,18 @@
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
 getSchemas():
-TABLE_SCHEM[VARCHAR]
-APP
-NULLID
-SQLJ
-SYS
-SYSCAT
-SYSCS_DIAG
-SYSCS_UTIL
-SYSFUN
-SYSIBM
-SYSPROC
-SYSSTAT
+TABLE_SCHEM[VARCHAR],TABLE_CATALOG[VARCHAR]
+APP,null
+NULLID,null
+SQLJ,null
+SYS,null
+SYSCAT,null
+SYSCS_DIAG,null
+SYSCS_UTIL,null
+SYSFUN,null
+SYSIBM,null
+SYSPROC,null
+SYSSTAT,null
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape():