Merge pull request #42 from INPUTsys-Chris/close_on_error

Fix #40

VERSION

@@ -1,2 +1,2 @@
 version=3.35.5
-artifactVersion=3.35.5.1
+artifactVersion=3.35.5.2

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.willena</groupId>
     <artifactId>sqlite-jdbc</artifactId>
-    <version>3.35.5.1</version>
+    <version>3.35.5.2</version>
     <name>SQLite JDBC</name>
     <description>SQLite JDBC library with encryption and authentication support</description>
     <url>https://github.com/Willena/sqlite-jdbc-crypt</url>

src/main/java/org/sqlite/SQLiteConnection.java

@@ -62,9 +62,13 @@ public SQLiteConnection(String url, String fileName) throws SQLException {
     public SQLiteConnection(String url, String fileName, Properties prop) throws SQLException {
         this.db = open(url, fileName, prop);
         SQLiteConfig config = db.getConfig();
-        this.connectionConfig = db.getConfig().newConnectionConfig();
-
-        config.apply(this);
+        this.connectionConfig = config.newConnectionConfig();
+        try {
+            config.apply(this);
+        } catch (SQLException throwable) {
+            this.db.close();
+            throw throwable;
+        }
     }
 
     public SQLiteConnectionConfig getConnectionConfig() {

src/test/java/org/sqlite/SQLiteMCPragmaTest.java

@@ -223,5 +223,19 @@ public void crossCipherAlgorithmTest() throws IOException, SQLException {
 //        c.close();
     }
 
+    @Test
+    public void closeDeleteTest() throws IOException, SQLException {
+        String dbfile = createFile();
+        String key = "key";
+        cipherDatabaseCreate(new SQLiteMCConfig(), dbfile, key);
+
+        Connection c = cipherDatabaseOpen(new SQLiteMCConfig(), dbfile, key);
+        assertTrue("Should be able to read the base db", databaseIsReadable(c));
+        c.close();
+
+        c = cipherDatabaseOpen(SQLiteMCRC4Config.getDefault(), dbfile, key);
+        assertNull("Should not be readable with RC4", c);
+        assertTrue("Connection must be closed, should be deleted", new File(dbfile).delete());
+    }
 
 }