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/01/22 19:13:04 UTC

svn commit: r498732 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNetClient/ tests/jdbcapi/

Author: djd
Date: Mon Jan 22 10:13:02 2007
New Revision: 498732

URL: http://svn.apache.org/viewvc?view=rev&rev=498732
Log:
DERBY-2243 Modifying the return type for methods like
- supportsANSI92EntryLevelSQL()
- supportsExpressionsInOrderBy()
  in EmbedDatabaseMetaData.java to return TRUE as Derby does support these features
Thus now the behavior is consistent across drivers. 
Contributed by Saurabh Vyas Saurabh.Vyas@Sun.COM

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Mon Jan 22 10:13:02 2007
@@ -175,7 +175,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Mon Jan 22 10:13:02 2007
@@ -205,7 +205,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_3.out Mon Jan 22 10:13:02 2007
@@ -904,7 +904,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true
@@ -916,7 +916,7 @@
 supportsMinimumSQLGrammar(): true
 supportsCoreSQLGrammar(): false
 supportsExtendedSQLGrammar(): false
-supportsANSI92EntryLevelSQL(): false
+supportsANSI92EntryLevelSQL(): true
 supportsANSI92IntermediateSQL(): false
 supportsANSI92FullSQL(): false
 supportsIntegrityEnhancementFacility(): false
@@ -2397,7 +2397,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true
@@ -2409,7 +2409,7 @@
 supportsMinimumSQLGrammar(): true
 supportsCoreSQLGrammar(): false
 supportsExtendedSQLGrammar(): false
-supportsANSI92EntryLevelSQL(): false
+supportsANSI92EntryLevelSQL(): true
 supportsANSI92IntermediateSQL(): false
 supportsANSI92FullSQL(): false
 supportsIntegrityEnhancementFacility(): false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Mon Jan 22 10:13:02 2007
@@ -175,7 +175,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true
@@ -187,7 +187,7 @@
 supportsMinimumSQLGrammar(): true
 supportsCoreSQLGrammar(): false
 supportsExtendedSQLGrammar(): false
-supportsANSI92EntryLevelSQL(): false
+supportsANSI92EntryLevelSQL(): true
 supportsANSI92IntermediateSQL(): false
 supportsANSI92FullSQL(): false
 supportsIntegrityEnhancementFacility(): false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Mon Jan 22 10:13:02 2007
@@ -205,7 +205,7 @@
 supportsConvert(Types.INTEGER, Types.SMALLINT): false
 supportsTableCorrelationNames(): true
 supportsDifferentTableCorrelationNames(): true
-supportsExpressionsInOrderBy(): false
+supportsExpressionsInOrderBy(): true
 supportsOrderByUnrelated(): false
 supportsGroupBy(): true
 supportsGroupByUnrelated(): true
@@ -217,7 +217,7 @@
 supportsMinimumSQLGrammar(): true
 supportsCoreSQLGrammar(): false
 supportsExtendedSQLGrammar(): false
-supportsANSI92EntryLevelSQL(): false
+supportsANSI92EntryLevelSQL(): true
 supportsANSI92IntermediateSQL(): false
 supportsANSI92FullSQL(): false
 supportsIntegrityEnhancementFacility(): false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?view=diff&rev=498732&r1=498731&r2=498732
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Mon Jan 22 10:13:02 2007
@@ -208,12 +208,10 @@
         assertTrue(dmd.supportsAlterTableWithAddColumn());
         assertTrue(dmd.supportsAlterTableWithDropColumn());
         
-        // Bug DERBY-2243 - return value is indicating support
-        // level of the SQL engine, so should be consistent.
-        if (usingEmbedded())
-            assertFalse(dmd.supportsANSI92EntryLevelSQL());
-        else
-            assertTrue(dmd.supportsANSI92EntryLevelSQL());
+	/* DERBY-2243 Derby does support ANSI 92 standards
+	* and this behaviour is now consistant across drivers
+	*/
+	assertTrue(dmd.supportsANSI92EntryLevelSQL());
               
         assertFalse(dmd.supportsANSI92FullSQL());
         assertFalse(dmd.supportsANSI92IntermediateSQL());
@@ -243,8 +241,10 @@
         assertFalse(dmd.supportsDataManipulationTransactionsOnly());
         assertTrue(dmd.supportsDifferentTableCorrelationNames());
         
-        // Bug DERBY-2244, order by with expressions was added by DERBY-134
-        assertFalse(dmd.supportsExpressionsInOrderBy());
+	/* DERBY-2244 Derby does support Order By clause
+	* thus the changing the assert condition to TRUE
+	*/
+	assertTrue(dmd.supportsExpressionsInOrderBy());
         
         assertFalse(dmd.supportsExtendedSQLGrammar());
         assertFalse(dmd.supportsFullOuterJoins());