Merge pull request #245 from fefe982/dev-del-acct

Delete all splits of a transaction when the transaction is deleted (not just those from the referencing account)

Author: codinguser

app/src/org/gnucash/android/db/AccountsDbAdapter.java

@@ -279,10 +279,25 @@ public boolean destructiveDeleteAccount(long rowId){
                     }
                 }
             }
+            // TODO: with "ON DELETE CASCADE", the first two delete will not be necessary.
+            //       deleteRecord(AccountEntry.TABLE_NAME, rowId); will delete related
+            //       transactions and splits
             //delete splits in this account
             mDb.delete(SplitEntry.TABLE_NAME,
-                    SplitEntry.COLUMN_ACCOUNT_UID + "=?",
+                    SplitEntry.COLUMN_TRANSACTION_UID  + " IN ( SELECT DISTINCT "
+                    + TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_UID
+                    + " FROM trans_split_acct WHERE "
+                    + AccountEntry.TABLE_NAME + "_" + AccountEntry.COLUMN_UID
+                    + " = ? )",
                     new String[]{getAccountUID(rowId)});
+            // delete empty transactions
+            // trans_split_acct is an inner joint, empty transactions will
+            // not be selected in this view
+            mDb.delete(TransactionEntry.TABLE_NAME,
+                    TransactionEntry.COLUMN_UID  + " NOT IN ( SELECT DISTINCT "
+                            + TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_UID
+                            + " FROM trans_split_acct )",
+                    null);
             deleteRecord(AccountEntry.TABLE_NAME, rowId);
             mDb.setTransactionSuccessful();
             return true;

app/src/org/gnucash/android/db/SplitsDbAdapter.java

@@ -515,13 +515,19 @@ public long getTransactionID(String transactionUID){
      * @param transactionId Database record ID of the transaction
      * @return <code>true</code> if at least one split was deleted, <code>false</code> otherwise.
      */
-    public boolean deleteSplitsForTransaction(long transactionId){
+    public boolean deleteSplitsForTransaction(long transactionId) {
         String trxUID = getTransactionUID(transactionId);
-        boolean result = mDb.delete(SplitEntry.TABLE_NAME,
-                SplitEntry.COLUMN_TRANSACTION_UID + "=?",
-                new String[]{trxUID}) > 0;
-        result &= deleteTransaction(transactionId);
-        return result;
+        mDb.beginTransaction();
+        try {
+            mDb.delete(SplitEntry.TABLE_NAME,
+                    SplitEntry.COLUMN_TRANSACTION_UID + "=?",
+                    new String[]{trxUID});
+            boolean result = deleteTransaction(transactionId);
+            mDb.setTransactionSuccessful();
+            return result;
+        } finally {
+            mDb.endTransaction();
+        }
     }
 
     /**

app/src/org/gnucash/android/db/TransactionsDbAdapter.java

@@ -439,8 +439,7 @@ public String getUID(long transactionId){
     @Override
 	public boolean deleteRecord(long rowId){
 		Log.d(TAG, "Delete transaction with record Id: " + rowId);
-		return mSplitsDbAdapter.deleteSplitsForTransaction(rowId) &&
-                deleteRecord(TransactionEntry.TABLE_NAME, rowId);
+		return mSplitsDbAdapter.deleteSplitsForTransaction(rowId);
 	}
 
 	/**

app/src/org/gnucash/android/ui/transaction/TransactionsListFragment.java

@@ -117,11 +117,9 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
 				return true;
 
 			case R.id.context_menu_delete:
-                SplitsDbAdapter splitsDbAdapter = new SplitsDbAdapter(getActivity());
 				for (long id : getListView().getCheckedItemIds()) {
-                    splitsDbAdapter.deleteSplitsForTransactionAndAccount(mTransactionsDbAdapter.getUID(id), mAccountUID);
+                    mTransactionsDbAdapter.deleteRecord(id);
 				}
-                splitsDbAdapter.close();
 				refresh();
 				mode.finish();
 				WidgetConfigurationActivity.updateAllWidgets(getActivity());