Fix exception in load-migrations

weavejester · Nov 8, 2024 · 5327371 · 5327371
1 parent 536e717
commit 5327371
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/sql/src/ragtime/sql.clj b/sql/src/ragtime/sql.clj
@@ -44,8 +44,8 @@
   (->> (slurp f)
        (edn/read-string)
        (wrap-single-migration)
-       (map normalize-migration)
        (compiler/compile)
+       (map normalize-migration)
        (guess-id-from-file-extension f)))
 
 (defmulti load-file-seq

diff --git a/sql/test/migrations/008-test.edn b/sql/test/migrations/008-test.edn
@@ -1,2 +1,3 @@
 [{:id "008-test" :up ["CREATE TABLE aaa (id int)"] :down ["DROP TABLE aaa"]}
- {:id "009-test" :do [[:create-table bbb [id "int"]]]}]
+ {:id "009-test" :do [[:create-table bbb [id "int"]]]}
+ [:create-table ccc [id "int"]]]
diff --git a/sql/test/ragtime/sql_test.clj b/sql/test/ragtime/sql_test.clj
@@ -26,7 +26,9 @@
           {:id "008-test", :transactions :both
            :up ["CREATE TABLE aaa (id int)"] :down ["DROP TABLE aaa"]}
           {:id "009-test", :transactions :both
-           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}]
+           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}
+          {:id "create-table-ccc", :transactions :both
+           :up ["CREATE TABLE ccc (id int)"] :down ["DROP TABLE ccc"]}]
          (sql/load-directory "test/migrations"))))
 
 (deftest test-load-resources
@@ -53,12 +55,16 @@
           {:id "008-test", :transactions :both
            :up ["CREATE TABLE aaa (id int)"] :down ["DROP TABLE aaa"]}
           {:id "009-test", :transactions :both
-           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}]
+           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}
+          {:id "create-table-ccc", :transactions :both
+           :up ["CREATE TABLE ccc (id int)"] :down ["DROP TABLE ccc"]}]
          (sql/load-resources "migrations"))))
 
 (deftest test-load-migrations
   (is (= [{:id "008-test", :transactions :both
            :up ["CREATE TABLE aaa (id int)"] :down ["DROP TABLE aaa"]}
           {:id "009-test", :transactions :both
-           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}]
+           :up ["CREATE TABLE bbb (id int)"] :down ["DROP TABLE bbb"]}
+          {:id "create-table-ccc", :transactions :both
+           :up ["CREATE TABLE ccc (id int)"] :down ["DROP TABLE ccc"]}]
          (sql/load-migrations "test/migrations/008-test.edn"))))