Merge branch 'saschpe-deletetrigger' into develop

agrosner · Dec 28, 2017 · e8330fc · e8330fc
2 parents db2caad + 7ff338d
commit e8330fc
Showing 1 changed file with 26 additions and 8 deletions.
diff --git a/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java b/dbflow/src/main/java/com/raizlabs/android/dbflow/sql/SqlUtils.java
@@ -158,19 +158,32 @@ public static Uri getNotificationUri(@NonNull String contentAuthority,
     /**
      * Drops an active TRIGGER by specifying the onTable and triggerName
      *
-     * @param mOnTable    The table that this trigger runs on
+     * @param onTable     The table that this trigger runs on
      * @param triggerName The name of the trigger
      */
-    public static void dropTrigger(@NonNull Class<?> mOnTable, @NonNull String triggerName) {
+    public static void dropTrigger(Class<?> onTable, String triggerName) {
         QueryBuilder queryBuilder = new QueryBuilder("DROP TRIGGER IF EXISTS ")
-                .append(triggerName);
-        FlowManager.getDatabaseForTable(mOnTable).getWritableDatabase().execSQL(queryBuilder.getQuery());
+            .append(triggerName);
+        FlowManager.getDatabaseForTable(onTable).getWritableDatabase().execSQL(queryBuilder.getQuery());
     }
 
     /**
-     * Drops an active INDEX by specifying the onTable and indexName
+     * Drops an active TRIGGER by specifying the databaseWrapper and triggerName
      *
-     * @param indexName The name of the index.
+     * @param databaseWrapper The manually specified wrapper.
+     * @param triggerName     The name of the trigger
+     */
+    public static void dropTrigger(DatabaseWrapper databaseWrapper, String triggerName) {
+        QueryBuilder queryBuilder = new QueryBuilder("DROP TRIGGER IF EXISTS ")
+            .append(triggerName);
+        databaseWrapper.execSQL(queryBuilder.getQuery());
+    }
+
+    /**
+     * Drops an active INDEX by specifying the databaseWrapper and indexName
+     *
+     * @param databaseWrapper The manually specified wrapper.
+     * @param indexName       The name of the index.
      */
     public static void dropIndex(@NonNull DatabaseWrapper databaseWrapper,
                                  @NonNull String indexName) {
@@ -179,8 +192,13 @@ public static void dropIndex(@NonNull DatabaseWrapper databaseWrapper,
         databaseWrapper.execSQL(queryBuilder.getQuery());
     }
 
-    public static void dropIndex(@NonNull Class<?> onTable,
-                                 @NonNull String indexName) {
+    /**
+     * Drops an active INDEX by specifying the onTable and indexName
+     *
+     * @param onTable   The table that this trigger runs on
+     * @param indexName The name of the index.
+     */
+    public static void dropIndex(Class<?> onTable, String indexName) {
         dropIndex(FlowManager.getDatabaseForTable(onTable).getWritableDatabase(), indexName);
     }