remove read attached databases pragma

Author: Destrolaric

src/main/java/org/sqlite/SQLiteConfig.java

@@ -56,7 +56,6 @@ public class SQLiteConfig {
 
     private final int busyTimeout;
     private boolean explicitReadOnly;
-    private boolean readAttachedDatabases;
 
     private final SQLiteConnectionConfig defaultConnectionConfig;
 
@@ -94,10 +93,6 @@ public SQLiteConfig(Properties prop) {
         this.explicitReadOnly =
                 Boolean.parseBoolean(
                         pragmaTable.getProperty(Pragma.JDBC_EXPLICIT_READONLY.pragmaName, "false"));
-        this.readAttachedDatabases =
-                Boolean.parseBoolean(
-                        pragmaTable.getProperty(
-                                Pragma.METADATA_READ_ATTACHED_DATABASES.pragmaName, "false"));
     }
 
     public SQLiteConnectionConfig newConnectionConfig() {
@@ -191,9 +186,8 @@ public void apply(Connection conn) throws SQLException {
         pragmaParams.remove(Pragma.LIMIT_WORKER_THREADS.pragmaName);
         pragmaParams.remove(Pragma.LIMIT_PAGE_COUNT.pragmaName);
 
-        // exclude these "fake" pragmas from execution
+        // exclude this "fake" pragma from execution
         pragmaParams.remove(Pragma.JDBC_EXPLICIT_READONLY.pragmaName);
-        pragmaParams.remove(Pragma.METADATA_READ_ATTACHED_DATABASES.pragmaName);
 
         Statement stat = conn.createStatement();
         try {
@@ -336,10 +330,6 @@ public Properties toProperties() {
                 defaultConnectionConfig.getDateStringFormat());
         pragmaTable.setProperty(
                 Pragma.JDBC_EXPLICIT_READONLY.pragmaName, this.explicitReadOnly ? "true" : "false");
-        pragmaTable.setProperty(
-            Pragma.METADATA_READ_ATTACHED_DATABASES.pragmaName,
-            this.readAttachedDatabases ? "true" : "false"
-        );
         return pragmaTable;
     }
 
@@ -383,20 +373,6 @@ public void setExplicitReadOnly(boolean readOnly) {
         this.explicitReadOnly = readOnly;
     }
 
-    /** @return true if reading attached databases is allowed */
-    public boolean isReadAttachedDatabases() {
-        return readAttachedDatabases;
-    }
-
-    /**
-     * Enable reading attached databases in metadata, they will be shown as schemas
-     *
-     * @param readAttachedDatabases whether to read attached databases
-     */
-    public void setReadAttachedDatabases(boolean readAttachedDatabases) {
-        this.readAttachedDatabases = readAttachedDatabases;
-    }
-
     public enum Pragma {
 
         // Parameters requiring SQLite3 API invocation
@@ -558,11 +534,8 @@ public enum Pragma {
 
         // extensions: "fake" pragmas to allow conformance with JDBC
         JDBC_EXPLICIT_READONLY(
-                "jdbc.explicit_readonly", "Set explicit read only transactions", null),
-        // "fake" pragma to allow configurating metadata reading by driver
-        METADATA_READ_ATTACHED_DATABASES("metadata.read_attached_databases",
-                "Set read attached databases as schemas",
-                OnOff);
+                "jdbc.explicit_readonly", "Set explicit read only transactions", null);
+
         public final String pragmaName;
         public final String[] choices;
         public final String description;

src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java

@@ -681,7 +681,7 @@ public boolean supportsSavepoints() {
 
     /** @see java.sql.DatabaseMetaData#supportsSchemasInDataManipulation() */
     public boolean supportsSchemasInDataManipulation() {
-        return conn.getDatabase().getConfig().isReadAttachedDatabases();
+        return true;
     }
 
     /** @see java.sql.DatabaseMetaData#supportsSchemasInIndexDefinitions() */
@@ -1172,12 +1172,8 @@ public ResultSet getCrossReference(
     /** @see java.sql.DatabaseMetaData#getSchemas() */
     public ResultSet getSchemas() throws SQLException {
         if (getSchemas == null) {
-            if (conn.getDatabase().getConfig().isReadAttachedDatabases()) {
-                getSchemas = conn.prepareStatement(
-                        "select name as TABLE_SCHEM, null as TABLE_CATALOG from pragma_database_list;");
-            } else {
-                getSchemas = conn.prepareStatement("select null as TABLE_SCHEM, null as TABLE_CATALOG limit 0;");
-            }
+            getSchemas = conn.prepareStatement(
+                "select name as TABLE_SCHEM, null as TABLE_CATALOG from pragma_database_list;");
         }
 
         return getSchemas.executeQuery();

src/test/java/org/sqlite/DBMetaDataTest.java

@@ -1087,7 +1087,7 @@ public void columnOrderOfgetProcedurColumns() throws SQLException {
     @Test
     public void columnOrderOfgetSchemas() throws SQLException {
         ResultSet rs = meta.getSchemas();
-        assertThat(rs.next()).isFalse();
+        assertThat(rs.next()).isTrue();
         ResultSetMetaData rsmeta = rs.getMetaData();
         assertThat(rsmeta.getColumnCount()).isEqualTo(2);
         assertThat(rsmeta.getColumnName(1)).isEqualTo("TABLE_SCHEM");
@@ -1577,7 +1577,6 @@ class DBMetadataTestWithAttachedDatabases {
 
         @BeforeEach
         public void init() throws IOException, SQLException {
-            ((SQLiteConnection) conn).getDatabase().getConfig().setReadAttachedDatabases(true);
             testDB = Files.createTempFile("temp", ".sqlite").toFile();
             stat.executeUpdate("attach database \"" + testDB.toURI().toURL() + "\" as db2;");
             stat.executeUpdate(
@@ -1875,7 +1874,6 @@ public void getIndexInfoIndexedMultiForAttachedDatabase() throws SQLException {
 
         @AfterEach
         public void exit() throws SQLException {
-            ((SQLiteConnection) conn).getDatabase().getConfig().setReadAttachedDatabases(false);
             stat.executeUpdate("Detach database db2;");
             testDB.deleteOnExit();
         }