X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMobileLedgerDatabase.java;h=78c325e1317ef7673fcd6e20119ec3254eb2e98e;hb=3e01d1b42b99c9fce426df1750c0fae5a8fd0f0a;hp=8f8be513c8e60a837bcedca09fe02fc288c527c6;hpb=667ce42731c95a98926657fea359b56209f9348e;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java b/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
index 8f8be513..78c325e1 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -22,27 +22,36 @@ import android.content.res.Resources;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
 
 import androidx.lifecycle.MutableLiveData;
 
 import net.ktnx.mobileledger.BuildConfig;
+import net.ktnx.mobileledger.db.DB;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class MobileLedgerDatabase extends SQLiteOpenHelper {
     public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
-    private static final String DB_NAME = "MoLe.db";
-    private static final int LATEST_REVISION = 41;
+    public static final String DB_NAME = "MoLe.db";
+    private static final int LATEST_REVISION = 58;
     private static final String CREATE_DB_SQL = "create_db";
     private final Application mContext;
-
+    @Override
+    public void onOpen(SQLiteDatabase db) {
+        super.onOpen(db);
+        // force a check by Room to ensure everything is OK
+        // TODO: remove when all DB structure manipulation is via Room
+        DB.get()
+          .compileStatement("SELECT COUNT(*) FROM profiles");
+    }
     public MobileLedgerDatabase(Application context) {
         super(context, DB_NAME, null, LATEST_REVISION);
         debug("db", "creating helper instance");
@@ -76,46 +85,58 @@ public class MobileLedgerDatabase extends SQLiteOpenHelper {
 
         applyRevisionFile(db, rev_file);
     }
-    private void applyRevisionFile(SQLiteDatabase db, String rev_file) {
+    private void applyRevisionFile(SQLiteDatabase db, String revFile) {
         final Resources rm = mContext.getResources();
-        int res_id = rm.getIdentifier(rev_file, "raw", mContext.getPackageName());
+        int res_id = rm.getIdentifier(revFile, "raw", mContext.getPackageName());
         if (res_id == 0)
-            throw new SQLException(String.format(Locale.US, "No resource for %s", rev_file));
-        db.beginTransaction();
+            throw new SQLException(String.format(Locale.US, "No resource for %s", revFile));
+
         try (InputStream res = rm.openRawResource(res_id)) {
-            debug("db", "Applying " + rev_file);
+            debug("db", "Applying " + revFile);
             InputStreamReader isr = new InputStreamReader(res);
             BufferedReader reader = new BufferedReader(isr);
 
+            Pattern endOfStatement = Pattern.compile(";\\s*(?:--.*)?$");
+
             String line;
-            int line_no = 1;
+            String sqlStatement = null;
+            int lineNo = 0;
             while ((line = reader.readLine()) != null) {
-                if (line.startsWith("--")) {
-                    line_no++;
+                lineNo++;
+                if (line.startsWith("--"))
                     continue;
-                }
-                if (line.isEmpty()) {
-                    line_no++;
+                if (line.isEmpty())
                     continue;
-                }
+
+                if (sqlStatement == null)
+                    sqlStatement = line;
+                else
+                    sqlStatement = sqlStatement.concat(line);
+
+                Matcher m = endOfStatement.matcher(line);
+                if (!m.find())
+                    continue;
+
                 try {
-                    db.execSQL(line);
+                    db.execSQL(sqlStatement);
+                    sqlStatement = null;
                 }
                 catch (Exception e) {
                     throw new RuntimeException(
-                            String.format("Error applying %s, line %d", rev_file, line_no), e);
+                            String.format("Error applying %s, line %d, statement: %s", revFile,
+                                    lineNo, sqlStatement), e);
                 }
-                line_no++;
             }
 
-            db.setTransactionSuccessful();
+            if (sqlStatement != null)
+                throw new RuntimeException(String.format(
+                        "Error applying %s: EOF after continuation. Line %s, Incomplete " +
+                        "statement: %s", revFile, lineNo, sqlStatement));
+
         }
         catch (IOException e) {
-            Log.e("db", String.format("Error opening raw resource for %s", rev_file));
-            e.printStackTrace();
-        }
-        finally {
-            db.endTransaction();
+            throw new RuntimeException(String.format("Error opening raw resource for %s", revFile),
+                    e);
         }
     }
 }