refactor out sql module. add postgres module. make sqlite module depends on sql module

Author: nikolap

.gitignore

@@ -0,0 +1 @@
+.DS_Store

metrics/config.edn

@@ -6,7 +6,7 @@
                  :path   "deps.edn"
                  :target [:deps]
                  :action :merge
-                 :value  {io.github.kit-clj/kit-metrics {:mvn/version "1.0.1"}}}
+                 :value  {io.github.kit-clj/kit-metrics {:mvn/version "1.0.2"}}}
                 {:type   :edn
                  :path   "resources/system.edn"
                  :target []

modules.edn

@@ -6,9 +6,15 @@
   :kit/metrics
   {:path "metrics"
    :doc "adds support for metrics using prometheus through iapetos"}
+  :kit/sql
+  {:path "sql"
+   :doc "adds generic SQL support. Requires manual database driver setup"}
   :kit/sqlite
   {:path "sqlite"
    :doc "adds support for SQLite embedded database"}
+  :kit/postgres
+  {:path "postgres"
+   :doc "adds support for PostgreSQL database"}
   :kit/cljs
   {:path "cljs"
    :doc "adds support for cljs using shadow-cljs"}

postgres/config.edn

@@ -0,0 +1,17 @@
+{:default
+ {:require-restart? true
+  :requires [:kit/sql]
+  :actions
+  {:injections [{:type   :edn
+                 :path   "resources/system.edn"
+                 :target []
+                 :action :merge
+                 :value  {:db.sql/connection #profile
+                                              {:dev  {:jdbc-url "jdbc:postgresql://localhost:5432/<<name>>_dev?user=<<name>>&password=<<name>>"}
+                                               :test {:jdbc-url "jdbc:postgresql://localhost:5432/<<name>>_test?user=<<name>>&password=<<name>>"}
+                                               :prod {:jdbc-url #env JDBC_URL}}}}
+                {:type   :edn
+                 :path   "deps.edn"
+                 :target [:deps]
+                 :action :merge
+                 :value  {org.postgresql/postgresql {:mvn/version "42.3.4"}}}]}}}

sql/assets/queries.sql

@@ -0,0 +1 @@
+-- Place your queries here. Docs available https://www.hugsql.org/

sql/config.edn

@@ -0,0 +1,30 @@
+{:default
+ {:require-restart? true
+  :actions
+  {:assets     [["assets/queries.sql" "resources/sql/queries.sql"]
+                "resources/migrations"]
+   :injections [{:type   :edn
+                 :path   "resources/system.edn"
+                 :target []
+                 :action :merge
+                 :value  {:db.sql/connection #profile
+                                              {:dev  {:jdbc-url "jdbc:TODO"}
+                                               :test {:jdbc-url "jdbc:TODO"}
+                                               :prod {:jdbc-url #env JDBC_URL}}
+                          :db.sql/query-fn   {:conn     #ig/ref :db.sql/connection
+                                              :options  {}
+                                              :filename "sql/queries.sql"}
+                          :db.sql/migrations {:store            :database
+                                              :db               {:datasource #ig/ref :db.sql/connection}
+                                              :migrate-on-init? true}}}
+                {:type   :edn
+                 :path   "deps.edn"
+                 :target [:deps]
+                 :action :merge
+                 :value  {io.github.kit-clj/kit-sql-conman   {:mvn/version "1.0.1"}
+                          io.github.kit-clj/kit-sql-migratus {:mvn/version "1.0.0"}}}
+                {:type   :clj
+                 :path   "src/clj/<<sanitized>>/core.clj"
+                 :action :append-requires
+                 :value  ["[kit.edge.db.sql.conman]
+[kit.edge.db.sql.migratus]"]}]}}}

sqlite/assets/queries.sql

@@ -1,29 +1,17 @@
 {:default
  {:require-restart? true
+  :requires [:kit/sql]
   :actions
-  {:assets     [["assets/queries.sql" "resources/sql/queries.sql"]
-                "resources/migrations"]
-   :injections [{:type   :edn
+  {:injections [{:type   :edn
                  :path   "resources/system.edn"
                  :target []
                  :action :merge
                  :value  {:db.sql/connection #profile
                                               {:dev  {:jdbc-url "jdbc:sqlite:<<name>>_dev.db"}
                                                :test {:jdbc-url "jdbc:sqlite:<<name>>_test.db"}
-                                               :prod {:jdbc-url #env JDBC_URL}}
-                          :db.sql/query-fn   {:conn     #ig/ref :db.sql/connection
-                                              :options  {}
-                                              :filename "sql/queries.sql"}
-                          :db.sql/migrations {:store            :database
-                                              :db               {:datasource #ig/ref :db.sql/connection}
-                                              :migrate-on-init? true}}}
+                                               :prod {:jdbc-url #env JDBC_URL}}}}
                 {:type   :edn
                  :path   "deps.edn"
                  :target [:deps]
                  :action :merge
-                 :value  {io.github.kit-clj/kit-sql {:mvn/version "1.0.0"}
-                          org.xerial/sqlite-jdbc    {:mvn/version "3.36.0.3"}}}
-                {:type   :clj
-                 :path   "src/clj/<<sanitized>>/core.clj"
-                 :action :append-requires
-                 :value  ["[kit.edge.db.sql]"]}]}}}
+                 :value  {org.xerial/sqlite-jdbc {:mvn/version "3.36.0.3"}}}]}}}