X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMobileLedgerDatabase.java;h=96f022b4ace6322765bb81acce5e83fa34e62a24;hp=be31ebdf0991790c33e9fd939ee147a9e93146d8;hb=1be8eb3dac1f2cbf8a87d5608265cb54a3427ce7;hpb=390a653a4424bd146f73bca3e421a0be252ee443

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 be31ebdf..96f022b4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
@@ -22,7 +22,6 @@ 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;
 
@@ -41,7 +40,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 public class MobileLedgerDatabase extends SQLiteOpenHelper {
     public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
     public static final String DB_NAME = "MoLe.db";
-    private static final int LATEST_REVISION = 55;
+    private static final int LATEST_REVISION = 57;
     private static final String CREATE_DB_SQL = "create_db";
     private final Application mContext;
 
@@ -78,40 +77,37 @@ 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));
+            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 continuation = Pattern.compile("\\\\\\s*$");
+            Pattern endOfStatement = Pattern.compile(";\\s*(?:--.*)$");
 
             String line;
             String sqlStatement = null;
-            int line_no = 1;
+            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 = continuation.matcher(line);
-                if (m.matches()) {
-                    line_no++;
+                Matcher m = endOfStatement.matcher(line);
+                if (!m.find())
                     continue;
-                }
 
                 try {
                     db.execSQL(sqlStatement);
@@ -119,19 +115,19 @@ public class MobileLedgerDatabase extends SQLiteOpenHelper {
                 }
                 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++;
             }
 
             if (sqlStatement != null)
                 throw new RuntimeException(
-                        String.format("Error applying %s: EOF after continuation", rev_file));
+                        String.format("Error applying %s: EOF after continuation", revFile));
 
         }
         catch (IOException e) {
-            Log.e("db", String.format("Error opening raw resource for %s", rev_file));
-            e.printStackTrace();
+            throw new RuntimeException(String.format("Error opening raw resource for %s", revFile),
+                    e);
         }
     }
 }