fix a few things

src/metabase/driver/generic_sql/sync.clj

@@ -47,13 +47,13 @@
       (fn [_]                     ; by wrapping the entire sync operation in this we can reuse the same connection throughout
         (->> @table-names
              (pmap (fn [table-name]
-                     (binding [*entity-overrides* {:transforms [#(assoc % :db (constantly database))]}] ; add a korma transform to Table that will assoc :db on results.
-                       (let [table (or (sel :one Table :db_id id :name table-name)                      ; Table's post-select only sets :db if it's not already set.
-                                       (ins Table                                                       ; This way, we can reuse a single `database` instead of creating
-                                            :db_id id                                                   ; a few dozen duplicate instances of it.
-                                            :name table-name                                            ; We can re-use one korma connection pool instead of
-                                            :active true))]                                             ; creating dozens of them, which was causing issues with too
-                         (update-table-row-count table)                                                 ; many open connections.
+                     (binding [*entity-overrides* {:transforms [#(assoc % :db (delay database))]}] ; add a korma transform to Table that will assoc :db on results.
+                       (let [table (or (sel :one Table :db_id id :name table-name)                 ; Table's post-select only sets :db if it's not already set.
+                                       (ins Table                                                  ; This way, we can reuse a single `database` instead of creating
+                                            :db_id id                                              ; a few dozen duplicate instances of it.
+                                            :name table-name                                       ; We can re-use one korma connection pool instead of
+                                            :active true))]                                        ; creating dozens of them, which was causing issues with too
+                         (update-table-row-count table)                                            ; many open connections.
                          (sync-fields table)
                          (log/debug "Synced" table-name)))))
              dorun)))))

src/metabase/models/database.clj

@@ -79,6 +79,10 @@
   (cond-> (assoc database :updated_at (new-sql-timestamp))
     details (assoc :details (json/write-str details))))
 
+(defmethod pre-cascade-delete Database [_ {:keys [id] :as database}]
+  (cascade-delete 'metabase.models.table/Table :db_id id)
+  (cascade-delete 'metabase.models.query/Query :database_id id))
+
 (defn databases-for-org
   "Selects the ID and NAME for all databases available to the given org-id."
   [org-id]

src/metabase/models/emailreport.clj

@@ -53,23 +53,20 @@
 
 (defmethod pre-update EmailReport [_ {:keys [version dataset_query schedule] :as report}]
   (assoc report
-    :updated_at (util/new-sql-timestamp)
+    :updated_at    (util/new-sql-timestamp)
     :dataset_query (json/write-str dataset_query)
-    :schedule (json/write-str schedule)
-    :version (+ 1 version)))
+    :schedule      (json/write-str schedule)
+    :version       (inc version)))
 
 
 (defmethod post-select EmailReport [_ {:keys [id creator_id organization_id] :as report}]
   (-> report
     (realize-json :dataset_query :schedule)
     (util/assoc*
-      :creator (delay
-                 (check creator_id 500 "Can't get creator: Query doesn't have a :creator_id.")
-                 (sel :one User :id creator_id))
-      :organization (delay
-                      (check organization_id 500 "Can't get database: Query doesn't have a :database_id.")
-                      (sel :one Org :id organization_id))
-      :recipients (delay
-                    (sel :many User
-                      (where {:id [in (subselect EmailReportRecipients (fields :user_id) (where {:emailreport_id id}))]}))))
+      :creator      (delay (check creator_id 500 "Can't get creator: Query doesn't have a :creator_id.")
+                           (sel :one User :id creator_id))
+      :organization (delay (check organization_id 500 "Can't get database: Query doesn't have a :database_id.")
+                           (sel :one Org :id organization_id))
+      :recipients   (delay (sel :many User
+                                (where {:id [in (subselect EmailReportRecipients (fields :user_id) (where {:emailreport_id id}))]}))))
     assoc-permissions-sets))

src/metabase/models/field.clj

@@ -84,6 +84,6 @@
                   :position 0}]
     (let [{:keys [field_type base_type special_type] :as field} (merge defaults field)]
       (assoc field
-             :base_type (name base_type)
+             :base_type    (name base_type)
              :special_type (when special_type (name special_type))
-             :field_type (name field_type)))))
+             :field_type   (name field_type)))))

src/metabase/models/query.clj

@@ -52,3 +52,6 @@
                          (sel :one Database :id database_id))
               :organization_id (delay (:organization_id @(:database <>))))
       assoc-permissions-sets))
+
+(defmethod pre-cascade-delete Query [_ {:keys [id] :as query}]
+  (cascade-delete 'metabase.models.query-execution/QueryExecution :query_id id))

src/metabase/models/table.clj

@@ -18,7 +18,7 @@
   [{:keys [name db]}]
   {:table name
    :pk :id
-   :db @(:korma-db (db))})
+   :db @(:korma-db @db)})
 
 (defn korma-count [{:keys [korma-entity]}]
   (-> @korma-entity
@@ -48,3 +48,6 @@
   (assoc table
          :created_at (util/new-sql-timestamp)
          :updated_at (util/new-sql-timestamp)))
+
+(defmethod pre-cascade-delete Table [_ {:keys [id] :as table}]
+  (cascade-delete Field :table_id id))

test/metabase/test_data/load.clj

@@ -59,13 +59,8 @@
   "Drop the test `Database` and `Fields`/`Tables` associated with it."
   []
   (when-let [{:keys [id]} (sel :one [Database :id] :name db-name)]
-    (let [table-ids (->> (sel :many [Table :id] :db_id id)
-                         (map :id)
-                         set)]
-      (delete Field (where {:table_id [in table-ids]}))
-      (delete Table (where {:id [in table-ids]}))
-      (del Database :id id)
-      (recur)))) ; recurse and delete any other DBs named db-name in case we somehow created more than one
+    (cascade-delete Database :id id)
+    (recur))) ; recurse and delete any other DBs named db-name in case we somehow created more than one
 
 
 ;; # INTERNAL IMPLENTATION DETAILS