start of deps.edn and koacha

layerware · Jul 29, 2023 · 7a977c2 · 7a977c2
1 parent 201d163
commit 7a977c2
Show file tree

Hide file tree

Showing 17 changed files with 167 additions and 156 deletions.
diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
@@ -5,12 +5,11 @@ on:
 
 jobs:
   lint-test-build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        java: ['8','11','17']
+        java: ["8", "11", "17"]
 
     services:
       postgres:
@@ -46,22 +45,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
 
       - name: Install Clojure
-        uses: DeLaGuardo/setup-clojure@4.0
+        uses: DeLaGuardo/setup-clojure@11.0
         with:
-          lein: 2.9.8
-
-      - name: Install jars locally
-        run: lein install-all
+          cli: "latest"
 
-      - name: Dependencies
-        run: lein deps
+      - name: Clojure
+        run: clojure -P -M:test
 
       - name: Test
-        working-directory: ./hugsql-core
-        run: lein test-all
+        run: bin/kaocha :core
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,19 @@
-/target
-/classes
-/checkouts
-pom.xml
-pom.xml.asc
-*.jar
-*.class
-/.lein-*
-/.nrepl-port
-.idea/
-*.iml
+# clojure & jvm
+**/classes
+**/target
+.nrepl-port
+.cpcache
 
+# editors and linting
+.idea
+.calva
+.lsp/
+/lsp/
+.clj-kondo/.cache
+.clj-kondo/*/**
+
+# mac
+**/.DS_Store
+
+# other
+derby.log
diff --git a/bin/kaocha b/bin/kaocha
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+clojure -M:test "$@"
diff --git a/deps.edn b/deps.edn
@@ -0,0 +1,66 @@
+{:aliases
+ {:dev                            {:extra-paths []
+                                   :extra-deps  {}}
+  ;; paths
+  :path-core-src                       ["hugsql-core/src"]
+  :path-adapter-src                    ["hugsql-adapter/src"]
+  :path-adapter-clojure-java-jdbc-src  ["hugsql-adapter-clojure-java-jdbc/src"]
+  :path-adapter-clojure-jdbc-src       ["hugsql-adapter-clojure-jdbc/src"]
+  :path-adapter-next-jdbc-src          ["hugsql-adapter-next-jdbc/src"]
+
+  :path-core-test                      ["hugsql-core/test"]
+  :path-adapter-test                   ["hugsql-adapter/test"]
+  :path-adapter-clojure-java-jdbc-test ["hugsql-adapter-clojure-java-jdbc/test"]
+  :path-adapter-clojure-jdbc-test      ["hugsql-adapter-clojure-jdbc/test"]
+  :path-adapter-next-jdbc-test         ["hugsql-adapter-next-jdbc/test"]
+
+  ;; libraries
+  :core                           {:extra-paths [:path-core-src]
+                                   :extra-deps  {}}
+  :adapter                        {:extra-paths [:path-adapter-src]
+                                   :extra-deps  {}}
+  :adapter-clojure-java-jdbc      {:extra-paths [:path-adapter-clojure-java-jdbc-src]
+                                   :extra-deps  {org.clojure/java.jdbc {:mvn/version "0.7.12"}}}
+  :adapter-clojure-jdbc           {:extra-paths [:path-adapter-clojure-jdbc-src]
+                                   :extra-deps  {funcool/clojure.jdbc {:mvn/version "0.9.0"}}}
+  :adapter-next-jdbc              {:extra-paths [:path-adapter-next-jdbc-src]
+                                   :extra-deps  {seancorfield/next.jdbc {:mvn/version "1.2.659"}}}
+
+  ;; tests
+  :test-core                      {:extra-paths [:path-core-test]
+                                   :extra-deps  {org.apache.derby/derby      {:mvn/version "10.16.1.1"}
+                                                 org.postgresql/postgresql   {:mvn/version "42.6.0"}
+                                                 com.mysql/mysql-connector-j {:mvn/version "8.1.0"}
+                                                 org.xerial/sqlite-jdbc      {:mvn/version "3.42.0.0"}
+                                                 org.hsqldb/hsqldb           {:mvn/version "2.7.2"}
+                                                 com.h2database/h2           {:mvn/version "2.2.220"}}}
+  :test-adapter                   {:extra-paths [:path-adapter-test]
+                                   :extra-deps  {}}
+  :test-adapter-clojure-java-jdbc {:extra-paths [:path-adapter-clojure-java-jdbc-test]
+                                   :extra-deps  {}}
+  :test-adapter-clojure-jdbc      {:extra-paths [:path-adapter-clojure-jdbc-test]
+                                   :extra-deps  {}}
+  :test-adapter-next-jdbc         {:extra-paths [:path-adapter-next-jdbc-test]
+                                   :extra-deps  {}}
+
+  :test                           {:main-opts   ["-m" "kaocha.runner"]
+                                   :extra-deps  {lambdaisland/kaocha         {:mvn/version "1.85.1342"}
+                                                 org.clojure/java.jdbc       {:mvn/version "0.7.12"}
+                                                 funcool/clojure.jdbc        {:mvn/version "0.9.0"}
+                                                 seancorfield/next.jdbc      {:mvn/version "1.2.659"}
+                                                 org.apache.derby/derby      {:mvn/version "10.16.1.1"}
+                                                 org.postgresql/postgresql   {:mvn/version "42.6.0"}
+                                                 com.mysql/mysql-connector-j {:mvn/version "8.1.0"}
+                                                 org.xerial/sqlite-jdbc      {:mvn/version "3.42.0.0"}
+                                                 org.hsqldb/hsqldb           {:mvn/version "2.7.2"}
+                                                 com.h2database/h2           {:mvn/version "2.2.220"}}
+                                   :extra-paths [:path-core-src
+                                                 :path-adapter-src
+                                                 :path-adapter-clojure-java-jdbc-src
+                                                 :path-adapter-clojure-jdbc-src
+                                                 :path-adapter-next-jdbc-src
+                                                 :path-core-test
+                                                 :path-adapter-test
+                                                 :path-adapter-clojure-java-jdbc-test
+                                                 :path-adapter-clojure-jdbc-test
+                                                 :path-adapter-next-jdbc-test]}}}
diff --git a/examples/princess-bride/.eastwood b/examples/princess-bride/.eastwood
diff --git a/examples/princess-bride/.gitignore b/examples/princess-bride/.gitignore
@@ -1,11 +1,14 @@
-/target
-/classes
-/checkouts
-pom.xml
-pom.xml.asc
-*.jar
-*.class
-/.lein-*
-/.nrepl-port
-.hgignore
-.hg/
+# clojure & jvm
+**/classes
+**/target
+.nrepl-port
+.cpcache
+
+# editors and linting
+.idea
+.calva
+.lsp/
+/lsp/
+.clj-kondo/.cache
+.clj-kondo/*/**
+
diff --git a/examples/princess-bride/test/princess_bride/core_test.clj b/examples/princess-bride/test/princess_bride/core_test.clj
diff --git a/hugsql-adapter-clojure-java-jdbc/project.clj b/hugsql-adapter-clojure-java-jdbc/project.clj
diff --git a/hugsql-adapter-clojure-jdbc/.gitignore b/hugsql-adapter-clojure-jdbc/.gitignore
diff --git a/hugsql-adapter-clojure-jdbc/project.clj b/hugsql-adapter-clojure-jdbc/project.clj
diff --git a/hugsql-adapter-next-jdbc/.gitignore b/hugsql-adapter-next-jdbc/.gitignore
diff --git a/hugsql-adapter-next-jdbc/project.clj b/hugsql-adapter-next-jdbc/project.clj
diff --git a/hugsql-adapter/project.clj b/hugsql-adapter/project.clj
diff --git a/hugsql-core/project.clj b/hugsql-core/project.clj
diff --git a/hugsql-core/test/hugsql/core_test.clj b/hugsql-core/test/hugsql/core_test.clj
@@ -330,7 +330,7 @@
                        (insert-into-test-table-return-keys db {:id 10 :name "J"} {})))
 
                 :h2
-                (is (= {(keyword "scope_identity()") 11}
+                (is (= {:id 11}
                        (insert-into-test-table-return-keys db {:id 11 :name "J"} {})))
 
                 ;; hsql and derby don't seem to support .getGeneratedKeys
@@ -351,7 +351,7 @@
                        (insert-into-test-table-return-keys db {:id 10 :name "J"} {})))
 
                 :h2
-                (is (= [{(keyword "scope_identity()") 11}]
+                (is (= [{:id 11}]
                        (insert-into-test-table-return-keys db {:id 11 :name "J"} {})))
 
                 ;; hsql and derby don't seem to support .getGeneratedKeys

diff --git a/project.clj b/project.clj
diff --git a/tests.edn b/tests.edn
@@ -0,0 +1,57 @@
+{;; use aero #include and #ref to bring in deps.edn paths
+ :deps.edn                               #include "deps.edn"
+ :core/source-paths                      #ref [:deps.edn :aliases :path-core-src]
+ :core/test-paths                        #ref [:deps.edn :aliases :path-core-test]
+ :adapter/source-paths                   #ref [:deps.edn :aliases :path-adapter-src]
+ :adapter/test-paths                     #ref [:deps.edn :aliases :path-adapter-test]
+ :adapter-clojure-java-jdbc/source-paths #ref [:deps.edn :aliases :path-adapter-clojure-java-jdbc-src]
+ :adapter-clojure-java-jdbc/test-paths   #ref [:deps.edn :aliases :path-adapter-clojure-java-jdbc-test]
+ :adapter-clojure-jdbc/source-paths      #ref [:deps.edn :aliases :path-adapter-clojure-jdbc-src]
+ :adapter-clojure-jdbc/test-paths        #ref [:deps.edn :aliases :path-adapter-clojure-jdbc-test]
+ :adapter-next-jdbc/source-paths         #ref [:deps.edn :aliases :path-adapter-next-jdbc-src]
+ :adapter-next-jdbc/test-paths           #ref [:deps.edn :aliases :path-adapter-next-jdbc-test]
+
+ :kaocha/tests                           [{:kaocha.testable/id      :core
+                                           :kaocha.testable/type    :kaocha.type/clojure.test
+                                           :kaocha/ns-patterns      ["-test$"]
+                                           :kaocha.filter/skip-meta [:pending]
+                                           :kaocha/source-paths     #ref [:core/source-paths]
+                                           :kaocha/test-paths       #ref [:core/test-paths]}
+
+                                          {:kaocha.testable/id      :adapter
+                                           :kaocha.testable/type    :kaocha.type/clojure.test
+                                           :kaocha/ns-patterns      ["-test$"]
+                                           :kaocha.filter/skip-meta [:pending]
+                                           :kaocha/source-paths     #ref [:adapter/source-paths]
+                                           :kaocha/test-paths       #ref [:adapter/test-paths]}
+
+                                          {:kaocha.testable/id      :adapter-clojure-java-jdbc
+                                           :kaocha.testable/type    :kaocha.type/clojure.test
+                                           :kaocha/ns-patterns      ["-test$"]
+                                           :kaocha.filter/skip-meta [:pending]
+                                           :kaocha/source-paths     #ref [:adapter-clojure-java-jdbc/source-paths]
+                                           :kaocha/test-paths       #ref [:adapter-clojure-java-jdbc/test-paths]}
+
+                                          {:kaocha.testable/id      :adapter-clojure-jdbc
+                                           :kaocha.testable/type    :kaocha.type/clojure.test
+                                           :kaocha/ns-patterns      ["-test$"]
+                                           :kaocha.filter/skip-meta [:pending]
+                                           :kaocha/source-paths     #ref [:adapter-clojure-jdbc/source-paths]
+                                           :kaocha/test-paths       #ref [:adapter-clojure-jdbc/test-paths]}
+
+                                          {:kaocha.testable/id      :adapter-next-jdbc
+                                           :kaocha.testable/type    :kaocha.type/clojure.test
+                                           :kaocha/ns-patterns      ["-test$"]
+                                           :kaocha.filter/skip-meta [:pending]
+                                           :kaocha/source-paths     #ref [:adapter-next-jdbc/source-paths]
+                                           :kaocha/test-paths       #ref [:adapter-next-jdbc/test-paths]}]
+
+ :kaocha/color?                          true
+ :kaocha/reporter                        [kaocha.report/documentation]
+ :kaocha/plugins                         [:kaocha.plugin/randomize
+                                          :kaocha.plugin/filter
+                                          :kaocha.plugin/capture-output
+                                          :kaocha.plugin/profiling]
+ :kaocha.plugin.randomize/randomize?     true
+ :kaocha.plugin.profiling/count          3
+ :kaocha.plugin.profiling/profiling?     true}