X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdao%2FAccountDAO.java;h=bb8d4ec2333d9e34a647d83c28ded648cdfd1762;hp=31aafbf200fdf9dc6a796c55666ced9816e33ee5;hb=93545c6fbf1244fbd96ecfc50e1115dbdc25f9ae;hpb=1c3647f273df2f15ef299896c24cda95c6119988

diff --git a/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java b/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
index 31aafbf2..bb8d4ec2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
+++ b/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
@@ -33,8 +33,16 @@ import java.util.List;
 
 @Dao
 public abstract class AccountDAO extends BaseDAO<Account> {
+    static public List<String> unbox(List<AccountNameContainer> list) {
+        ArrayList<String> result = new ArrayList<>(list.size());
+        for (AccountNameContainer item : list) {
+            result.add(item.name);
+        }
+
+        return result;
+    }
     @Insert
-    public abstract void insertSync(Account item);
+    public abstract long insertSync(Account item);
 
     @Update
     public abstract void updateSync(Account item);
@@ -45,40 +53,31 @@ public abstract class AccountDAO extends BaseDAO<Account> {
     @Query("SELECT * FROM accounts")
     public abstract LiveData<List<Account>> getAll();
 
-    @Query("SELECT * FROM accounts WHERE profile = :profileUUID AND name = :accountName")
-    public abstract LiveData<Account> getByName(@NonNull String profileUUID,
-                                                @NonNull String accountName);
-
-//    not useful for now
+    //    not useful for now
 //    @Transaction
 //    @Query("SELECT * FROM patterns")
 //    List<PatternWithAccounts> getPatternsWithAccounts();
+    @Query("SELECT * FROM accounts WHERE profile_id = :profileId AND name = :accountName")
+    public abstract LiveData<Account> getByName(long profileId, @NonNull String accountName);
 
-    static public List<String> unbox(List<AccountNameContainer> list) {
-        ArrayList<String> result = new ArrayList<>(list.size());
-        for (AccountNameContainer item : list) {
-            result.add(item.name);
-        }
-
-        return result;
-    }
     @Query("SELECT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
-           "WHERE profile=:profileUUID AND name_upper LIKE '%%'||:term||'%%' " +
+           "WHERE profile_id=:profileId AND name_upper LIKE '%%'||:term||'%%' " +
            "ORDER BY ordering, name_upper, rowid ")
-    public abstract LiveData<List<AccountNameContainer>> lookupInProfileByName(
-            @NonNull String profileUUID, @NonNull String term);
+    public abstract LiveData<List<AccountNameContainer>> lookupInProfileByName(long profileId,
+                                                                               @NonNull
+                                                                                       String term);
 
     @Query("SELECT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
-           "WHERE profile=:profileUUID AND name_upper LIKE '%%'||:term||'%%' " +
+           "WHERE profile_id=:profileId AND name_upper LIKE '%%'||:term||'%%' " +
            "ORDER BY ordering, name_upper, rowid ")
-    public abstract List<AccountNameContainer> lookupInProfileByNameSync(
-            @NonNull String profileUUID, @NonNull String term);
+    public abstract List<AccountNameContainer> lookupInProfileByNameSync(long profileId,
+                                                                         @NonNull String term);
 
     @Query("SELECT DISTINCT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +