Merge pull request #611 from couchbase/feature/issue_609_prebuilt_database

Fixed #609 - pre-built database

Author: pasin

src/main/java/com/couchbase/lite/Database.java

@@ -1197,7 +1197,25 @@ public synchronized boolean open() {
             //       Android version should be one version higher.
             if (dbVersion < 18) {
                 // Version 12: Because of a bug fix that changes JSON collation, invalidate view indexes
-                String upgradeSql = "DELETE FROM maps; UPDATE views SET lastsequence=0; " +
+
+                // instead of delete all rows in maps table, drop table and recreate it.
+                String upgradeSql = "DROP TABLE maps";
+                if (!initialize(upgradeSql)) {
+                    return false;
+                }
+
+                upgradeSql = "CREATE TABLE IF NOT EXISTS maps ( " +
+                    " view_id INTEGER NOT NULL REFERENCES views(view_id) ON DELETE CASCADE, " +
+                    " sequence INTEGER NOT NULL REFERENCES revs(sequence) ON DELETE CASCADE, " +
+                    " key TEXT NOT NULL COLLATE JSON, " +
+                    " value TEXT); " +
+                    " CREATE INDEX IF NOT EXISTS maps_keys on maps(view_id, key COLLATE JSON); " +
+                    " CREATE INDEX IF NOT EXISTS maps_sequence ON maps(sequence);";
+                if (!initialize(upgradeSql)) {
+                    return false;
+                }
+
+                upgradeSql = "UPDATE views SET lastsequence=0; " +
                         "PRAGMA user_version = 18";
                 if (!initialize(upgradeSql)) {
                     return false;
@@ -1211,6 +1229,20 @@ public synchronized boolean open() {
             //       1. Creates attachments table if it does not exist.
             //       2. Iterate revs table to populate attachments table.
             if (dbVersion >= 101) {
+
+                // NOTE: CBL iOS v1.1.0 does not have maps table, Needs to create it if it does not exist.
+                String upgradeSql = "CREATE TABLE IF NOT EXISTS maps ( " +
+                        " view_id INTEGER NOT NULL REFERENCES views(view_id) ON DELETE CASCADE, " +
+                        " sequence INTEGER NOT NULL REFERENCES revs(sequence) ON DELETE CASCADE, " +
+                        " key TEXT NOT NULL COLLATE JSON, " +
+                        " value TEXT); " +
+                        " CREATE INDEX IF NOT EXISTS maps_keys on maps(view_id, key COLLATE JSON); " +
+                        " CREATE INDEX IF NOT EXISTS maps_sequence ON maps(sequence);";
+                if (!initialize(upgradeSql)) {
+                    return false;
+                }
+
+
                 // Check if attachments table exists. If not, create the table, and iterate revs
                 // to populate attachment table
                 boolean existsAttachments = false;
@@ -1231,7 +1263,7 @@ public synchronized boolean open() {
 
                 if (!existsAttachments) {
                     // 1. create attachments table
-                    String upgradeSql = "CREATE TABLE attachments ( " +
+                    upgradeSql = "CREATE TABLE attachments ( " +
                             "sequence INTEGER NOT NULL REFERENCES revs(sequence) ON DELETE CASCADE, " +
                             "filename TEXT NOT NULL, " +
                             "key BLOB NOT NULL, " +

src/main/java/com/couchbase/lite/Manager.java

@@ -284,7 +284,8 @@ public void replaceDatabase(String databaseName, InputStream databaseStream, Map
 
     private void replaceDatabase(String databaseName, InputStream databaseStream, Iterator<Map.Entry<String, InputStream>> attachmentStreams) throws CouchbaseLiteException {
         try {
-            Database database = getDatabase(databaseName);
+            //Database database = getDatabase(databaseName);
+            Database database = getDatabaseWithoutOpening(databaseName, false);
             String dstAttachmentsPath = database.getAttachmentStorePath();
             OutputStream destStream = new FileOutputStream(new File(database.getPath()));
             StreamUtils.copyStream(databaseStream, destStream);