Extra tests (#131)

Author: camsaul

test/toucan2/test.clj

@@ -313,16 +313,24 @@
 
 (defmacro with-discarded-table-changes
   {:style/indent 1}
-  [table-name & body]
-  `(do-with-discarded-table-changes (current-db-type) ~table-name (^:once fn* [] ~@body)))
+  [table-name-or-names & body]
+  (let [table-names (if (sequential? table-name-or-names)
+                      table-name-or-names
+                      [table-name-or-names])]
+    (reduce (fn [expr table-name]
+              `(do-with-discarded-table-changes (current-db-type) ~table-name (^:once fn* [] ~expr)))
+            `(do ~@body)
+            table-names)))
 
 (defn discard-table-changes-all-dbs! [table-name]
   (doseq [db-type (db-types)]
     (binding [*current-db-type* db-type]
       (create-table! table-name))))
 
 (s/fdef with-discarded-table-changes
-  :args (s/cat :table-name (some-fn symbol? keyword? string?)
+  :args (s/cat :table-name (let [table-name (some-fn symbol? simple-keyword? string?)]
+                             (s/alt :table-name  table-name
+                                    :table-names (s/coll-of table-name :min-count 1)))
                :body       (s/+ any?))
   :ret  any?)
 

toucan1/test/toucan/db_test.clj

@@ -13,6 +13,7 @@
    [toucan.test-models.venue :refer [Venue]]
    [toucan.test-setup :as test-setup]
    [toucan2.connection :as conn]
+   [toucan2.insert :as insert]
    [toucan2.instance :as instance]
    [toucan2.jdbc :as jdbc]
    [toucan2.jdbc.query :as jdbc.query]
@@ -529,6 +530,41 @@
       (is (= {:id 4, :first-name "Grass", :last-name "HOPPER"}
              (t1.db/insert! User {:first-name "Grass" :last-name [:upper "Hopper"]}))))))
 
+(derive ::venues.edn-category ::test/venues)
+
+(t1.models/add-type!
+ ::edn
+ :in  pr-str
+ :out (fn [s]
+        (binding [*read-eval* false]
+          (read-string s))))
+
+(t1.models/deftypes
+ ::venues.edn-category
+ {:category ::edn})
+
+(deftest ^:synchronized insert!-deftypes-test
+  (test/with-discarded-table-changes "venues"
+    (is (= 2
+           (insert/insert! ::venues.edn-category
+                           [{:name "Venue 1", :category {:name "Category 1"}}
+                            {:name "Venue 2", :category {:name :category-2}}])))
+    (is (= [(instance/instance
+             ::venues.edn-category
+             {:id         5
+              :name       "Venue 2"
+              :category   {:name :category-2}
+              :created-at (java.time.LocalDateTime/parse "2017-01-01T00:00")
+              :updated-at (java.time.LocalDateTime/parse "2017-01-01T00:00")})
+            (instance/instance
+             ::venues.edn-category
+             {:id         4
+              :name       "Venue 1"
+              :category   {:name "Category 1"}
+              :created-at (java.time.LocalDateTime/parse "2017-01-01T00:00")
+              :updated-at (java.time.LocalDateTime/parse "2017-01-01T00:00")})]
+           (t1.db/select ::venues.edn-category {:order-by [[:id :desc]], :limit 2})))))
+
 (deftest ^:parallel select-one-test
   (is (= {:id 1, :first-name "Cam", :last-name "Saul"}
          (t1.db/select-one User, :first-name "Cam")))