You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2014/09/28 01:52:24 UTC

svn commit: r1628025 - in /db/derby/code/branches/10.10: ./ java/engine/org/apache/derby/impl/jdbc/ java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/

Author: myrnavl
Date: Sat Sep 27 23:52:24 2014
New Revision: 1628025

URL: http://svn.apache.org/r1628025
Log:
DERBY-6662; DatabaseMetaData.usesLocalFiles() returns true for in-memory databases
   backport of revision 1627895 and revision 1628009 from the 10.11 branch;
   making the affected methods return false for in-memory databases and adding a test.

Added:
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java
      - copied, changed from r1627895, db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java
Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/branches/10.11:r1627895,1628009
  Merged /db/derby/code/trunk:r1627671,1627851,1628008

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=1628025&r1=1628024&r2=1628025&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Sat Sep 27 23:52:24 2014
@@ -330,7 +330,10 @@ public class EmbedDatabaseMetaData exten
      * @return true if so
      */
 	public boolean usesLocalFiles() {
-		return true;
+        if (url.indexOf("memory") >1)
+            return false;
+        else
+            return true;
 	}
 
     /**
@@ -339,7 +342,10 @@ public class EmbedDatabaseMetaData exten
      * @return true if the database uses a local file for each table
      */
 	public boolean usesLocalFilePerTable() {
-		return true;
+        if (url.indexOf("memory") >1)
+            return false;
+        else
+            return true;
 	}
 
     /**

Copied: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java (from r1627895, db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java?p2=db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java&p1=db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java&r1=1627895&r2=1628025&rev=1628025&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java Sat Sep 27 23:52:24 2014
@@ -25,8 +25,13 @@ import junit.framework.Test;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
+
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
 public class Derby6662Test extends BaseJDBCTestCase {
@@ -55,16 +60,26 @@ public class Derby6662Test extends BaseJ
     {
         Connection conn = obtainConnection();
         // register the database metadata wrapper
-        goodStatement( conn, "call syscs_util.syscs_register_tool" +
+        Statement stmt = conn.createStatement();
+        stmt.execute("call syscs_util.syscs_register_tool" +
             "('databaseMetaData', true)");
         // run the routines
-        assertResults(conn,"values usesLocalFiles()",
-             new String[][]{ { "false" }},false);
-        assertResults(conn,"values usesLocalFilePerTable()",
-             new String[][]{ { "false" }},false);
+        assertResults(conn,"values usesLocalFiles()", "false");
+        assertResults(conn,"values usesLocalFilePerTable()", "false");
         // unregister the database metadata wrapper
-        goodStatement( conn, "call syscs_util.syscs_register_tool" +
+        stmt.execute("call syscs_util.syscs_register_tool" +
             "('databaseMetaData', false)");
+        stmt.close();
+        conn.close();
+    }
+    
+    public void assertResults(Connection conn, String sql,
+            String expectedValue) 
+    throws SQLException {
+        Statement stmt = conn.createStatement();
+        ResultSet rs = stmt.executeQuery(sql);
+        JDBC.assertSingleValueResultSet(rs, expectedValue);
+        stmt.close();
     }
     
     private DatabaseMetaData getDMD() throws SQLException
@@ -129,7 +144,7 @@ public class Derby6662Test extends BaseJ
             sb.append('/');
             sb.append("memory:");
         }
-        sb.append("MogTestDb");
+        sb.append("DBMDTestDb");
         return sb;
     }
 }

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java?rev=1628025&r1=1628024&r2=1628025&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java Sat Sep 27 23:52:24 2014
@@ -46,6 +46,7 @@ public class _Suite extends BaseTestCase
         // Tests are not yet compatible with JSR169 / JavaME
         if (!JDBC.vmSupportsJSR169()) {
             suite.addTest(BasicInMemoryDbTest.suite());
+            suite.addTest(Derby6662Test.suite());
             suite.addTest(MogTest.suite());
         }
         return suite;