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=ffdeb9e4cd39fde15d2c73922aed206e06b8c8f6;hp=e73c45a60bf0c69a1a8ffd73b29b8fd5bacb53bd;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=a983099d6150044a08a1fbc601d9af9bd8d0c0a8
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 e73c45a6..ffdeb9e4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MobileLedgerDatabase.java
@@ -1,25 +1,24 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.utils;
-import android.content.Context;
+import android.app.Application;
import android.content.res.Resources;
-import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
@@ -31,127 +30,79 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Locale;
-public class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
- public static final String DB_NAME = "mobile-ledger.db";
- public static final String ACCOUNTS_TABLE = "accounts";
- public static final String DESCRIPTION_HISTORY_TABLE = "description_history";
- public static final int LATEST_REVISION = 8;
+import static net.ktnx.mobileledger.utils.Logger.debug;
- private final Context mContext;
+public class MobileLedgerDatabase extends SQLiteOpenHelper {
+ private static final String DB_NAME = "MoLe.db";
+ private static final int LATEST_REVISION = 34;
+ private static final String CREATE_DB_SQL = "create_db";
- public
- MobileLedgerDatabase(Context context) {
+ private final Application mContext;
+
+ public MobileLedgerDatabase(Application context) {
super(context, DB_NAME, null, LATEST_REVISION);
- Log.d("db", "creating helper instance");
+ debug("db", "creating helper instance");
mContext = context;
+ super.setWriteAheadLoggingEnabled(true);
}
@Override
- public
- void onCreate(SQLiteDatabase db) {
- Log.d("db", "onCreate called");
- onUpgrade(db, -1, LATEST_REVISION);
+ public void onCreate(SQLiteDatabase db) {
+ debug("db", "onCreate called");
+ applyRevisionFile(db, CREATE_DB_SQL);
}
@Override
- public
- void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- Log.d("db", "onUpgrade called");
- for(int i = oldVersion+1; i <= newVersion; i++) applyRevision(db, i);
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ debug("db", "onUpgrade called");
+ for (int i = oldVersion + 1; i <= newVersion; i++) applyRevision(db, i);
}
- private void applyRevision(SQLiteDatabase db, int
- rev_no) {
- final Resources rm = mContext.getResources();
+ private void applyRevision(SQLiteDatabase db, int rev_no) {
String rev_file = String.format(Locale.US, "sql_%d", rev_no);
+ applyRevisionFile(db, rev_file);
+ }
+ private void applyRevisionFile(SQLiteDatabase db, String rev_file) {
+ final Resources rm = mContext.getResources();
int res_id = rm.getIdentifier(rev_file, "raw", mContext.getPackageName());
if (res_id == 0)
- throw new SQLException(String.format(Locale.US, "No resource for revision %d", rev_no));
+ throw new SQLException(String.format(Locale.US, "No resource for %s", rev_file));
db.beginTransaction();
try (InputStream res = rm.openRawResource(res_id)) {
- Log.d("db", "Applying revision " + String.valueOf(rev_no));
+ debug("db", "Applying " + rev_file);
InputStreamReader isr = new InputStreamReader(res);
BufferedReader reader = new BufferedReader(isr);
String line;
+ int line_no = 1;
while ((line = reader.readLine()) != null) {
- db.execSQL(line);
+ if (line.startsWith("--")) {
+ line_no++;
+ continue;
+ }
+ if (line.isEmpty()) {
+ line_no++;
+ continue;
+ }
+ try {
+ db.execSQL(line);
+ }
+ catch (Exception e) {
+ throw new RuntimeException(
+ String.format("Error applying %s, line %d", rev_file, line_no), e);
+ }
+ line_no++;
}
db.setTransactionSuccessful();
}
catch (IOException e) {
- Log.e("db", String.format("Error opening raw resource for revision %d", rev_no));
+ Log.e("db", String.format("Error opening raw resource for %s", rev_file));
e.printStackTrace();
}
finally {
db.endTransaction();
}
}
- public int get_option_value(String name, int default_value) {
- String s = get_option_value(name, String.valueOf(default_value));
- try {
- return Integer.parseInt(s);
- }
- catch (Exception e) {
- return default_value;
- }
- }
-
- public long get_option_value(String name, long default_value) {
- String s = get_option_value(name, String.valueOf(default_value));
- try {
- return Long.parseLong(s);
- }
- catch (Exception e) {
- Log.d("db", "returning default long value of "+name, e);
- return default_value;
- }
- }
-
- public String get_option_value(String name, String default_value) {
- Log.d("db", "about to fetch option "+name);
- try(SQLiteDatabase db = getReadableDatabase()) {
- try (Cursor cursor = db
- .rawQuery("select value from options where name=?", new String[]{name}))
- {
- if (cursor.moveToFirst()) {
- String result = cursor.getString(0);
-
- if (result == null) result = default_value;
-
- Log.d("db", "option " + name + "=" + result);
- return result;
- }
- else return default_value;
- }
- catch (Exception e) {
- Log.d("db", "returning default value for " + name, e);
- return default_value;
- }
- }
- }
-
- public void set_option_value(String name, String value) {
- Log.d("db", "setting option "+name+"="+value);
- try(SQLiteDatabase db = getWritableDatabase()) {
- db.execSQL("insert or replace into options(name, value) values(?, ?);",
- new String[]{name, value});
- }
- }
-
- public void set_option_value(String name, long value) {
- set_option_value(name, String.valueOf(value));
- }
- public static long get_option_value(Context context, String name, long default_value) {
- try(MobileLedgerDatabase db = new MobileLedgerDatabase(context)) {
- return db.get_option_value(name, default_value);
- }
- }
- public static void set_option_value(Context context, String name, String value) {
- try(MobileLedgerDatabase db = new MobileLedgerDatabase(context)) {
- db.set_option_value(name, value);
- }
- }
}