Only load temp DBs once #1458

test/metabase/api/table_test.clj

@@ -24,32 +24,34 @@
 
 ;; ## GET /api/table?org
 ;; These should come back in alphabetical order and include relevant metadata
-(expect (set (reduce concat (for [engine datasets/test-engines]
-                              (datasets/with-engine-when-testing engine
-                                [{:name                (format-name "categories")
-                                  :display_name        "Categories"
-                                  :db_id               (id)
-                                  :active              true
-                                  :rows                75
-                                  :id                  (id :categories)}
-                                 {:name                (format-name "checkins")
-                                  :display_name        "Checkins"
-                                  :db_id               (id)
-                                  :active              true
-                                  :rows                1000
-                                  :id                  (id :checkins)}
-                                 {:name                (format-name "users")
-                                  :display_name        "Users"
-                                  :db_id               (id)
-                                  :active              true
-                                  :rows                15
-                                  :id                  (id :users)}
-                                 {:name                (format-name "venues")
-                                  :display_name        "Venues"
-                                  :db_id               (id)
-                                  :active              true
-                                  :rows                100
-                                  :id                  (id :venues)}]))))
+(expect
+  (do (destroy-loaded-temp-dbs!)
+      (set (reduce concat (for [engine datasets/test-engines]
+                            (datasets/with-engine-when-testing engine
+                              [{:name                (format-name "categories")
+                                :display_name        "Categories"
+                                :db_id               (id)
+                                :active              true
+                                :rows                75
+                                :id                  (id :categories)}
+                               {:name                (format-name "checkins")
+                                :display_name        "Checkins"
+                                :db_id               (id)
+                                :active              true
+                                :rows                1000
+                                :id                  (id :checkins)}
+                               {:name                (format-name "users")
+                                :display_name        "Users"
+                                :db_id               (id)
+                                :active              true
+                                :rows                15
+                                :id                  (id :users)}
+                               {:name                (format-name "venues")
+                                :display_name        "Venues"
+                                :db_id               (id)
+                                :active              true
+                                :rows                100
+                                :id                  (id :venues)}])))))
   (->> ((user->client :rasta) :get 200 "table")
        (map #(dissoc % :db :created_at :updated_at :schema :entity_name :description :entity_type :visibility_type))
        set))

test/metabase/driver/query_processor_test.clj

@@ -1383,7 +1383,7 @@
 
 ;; RELATIVE DATES
 (defn- database-def-with-timestamps [interval-seconds]
-  (create-database-definition "DB"
+  (create-database-definition (str "a-checkin-every-" interval-seconds "-seconds")
     ["checkins"
      [{:field-name "timestamp"
        :base-type  :DateTimeField}]

test/metabase/test/data.clj

@@ -140,25 +140,39 @@
    (destroy-db! dataset-loader database-definition)))
 
 
+(def ^:private loader->loaded-db-def
+  (atom #{}))
+
+(defn destroy-loaded-temp-dbs!
+  "Destroy all temporary databases created by `with-temp-db`."
+  {:expectations-options :after-run}
+  []
+  (binding [*sel-disable-logging* true]
+    (doseq [[loader dbdef] @loader->loaded-db-def]
+      (try
+        (remove-database! loader dbdef)
+        (catch Throwable e
+          (println "Error destroying database:" e)))))
+  (reset! loader->loaded-db-def #{}))
+
+
 (defn -with-temp-db [^DatabaseDefinition dbdef f]
   (let [loader *data-loader*
         dbdef  (map->DatabaseDefinition (assoc dbdef :short-lived? true))]
-    (try
-      (with-db (binding [*sel-disable-logging* true]
-                 (let [db (get-or-create-database! loader dbdef)]
-                   (assert db)
-                   (assert (exists? Database :id (:id db)))
-                   db))
-        (f db))
-      (finally
-        (binding [*sel-disable-logging* true]
-          (remove-database! loader dbdef))))))
+    (swap! loader->loaded-db-def conj [loader dbdef])
+    (with-db (binding [*sel-disable-logging* true]
+               (let [db (get-or-create-database! loader dbdef)]
+                 (assert db)
+                 (assert (exists? Database :id (:id db)))
+                 db))
+      (f db))))
 
 
 (defmacro with-temp-db
   "Load and sync DATABASE-DEFINITION with DATASET-LOADER and execute BODY with
    the newly created `Database` bound to DB-BINDING.
-   Remove `Database` and destroy data afterward.
+   Add `Database` to `loader->loaded-db-def`, which can be destroyed with `destroy-loaded-temp-dbs!`,
+   which is automatically ran at the end of the test suite.
 
      (with-temp-db [db tupac-sightings]
        (driver/process-quiery {:database (:id db)