Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: libs and docker img #49

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .clj-kondo/com.github.seancorfield/next.jdbc/config.edn
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{:hooks
{:analyze-call
{next.jdbc/with-transaction
hooks.com.github.seancorfield.next-jdbc/with-transaction}}
:lint-as {next.jdbc/on-connection clojure.core/with-open}}
hooks.com.github.seancorfield.next-jdbc/with-transaction
next.jdbc/with-transaction+options
hooks.com.github.seancorfield.next-jdbc/with-transaction+options}}
:lint-as {next.jdbc/on-connection clojure.core/with-open
next.jdbc/on-connection+options clojure.core/with-open}}
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,19 @@
opts
body))]
{:node new-node})))

(defn with-transaction+options
"Expands (with-transaction+options [tx expr opts] body)
to (let [tx expr] opts body) per clj-kondo examples."
[{:keys [:node]}]
(let [[binding-vec & body] (rest (:children node))
[sym val opts] (:children binding-vec)]
(when-not (and sym val)
(throw (ex-info "No sym and val provided" {})))
(let [new-node (api/list-node
(list*
(api/token-node 'let)
(api/vector-node [sym val])
opts
body))]
{:node new-node})))
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Setup clojure-lsp
uses: clojure-lsp/setup-clojure-lsp@v1
with:
clojure-lsp-version: 2023.04.19-12.43.29
clojure-lsp-version: 2024.03.01-11.37.51

- name: Execute lint checks
run: |
Expand Down
12 changes: 6 additions & 6 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{:paths ["src" "resources"]

:deps {org.clojure/clojure {:mvn/version "1.11.1"}
com.github.parenthesin/components {:mvn/version "0.2.3"
com.github.parenthesin/components {:mvn/version "0.2.4"
:exclusions [metosin/malli]}
com.github.seancorfield/honeysql {:mvn/version "2.5.1103"}
com.github.seancorfield/honeysql {:mvn/version "2.6.1126"}
metosin/reitit-swagger {:mvn/version "0.6.0"}
org.postgresql/postgresql {:mvn/version "42.7.1"}
org.postgresql/postgresql {:mvn/version "42.7.2"}
prismatic/schema {:mvn/version "1.4.1"}
prismatic/schema-generators {:mvn/version "0.1.5"}}

Expand All @@ -14,14 +14,14 @@
:extra-deps {org.clojars.bigsy/pg-embedded-clj {:mvn/version "1.0.1"}
lambdaisland/kaocha {:mvn/version "1.87.1366"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.8.8"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.14.5"}}
:main-opts ["-m" "kaocha.runner"]}

:clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2023.12.29-12.09.27"}}
:clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.03.01-11.37.51"}}
:main-opts ["-m" "clojure-lsp.main"]}

:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.45.0"}}
:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.46.0"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware" "[cider.nrepl/cider-middleware]"]}

:migratus {:main-opts ["-m" "parenthesin.helpers.migrations"]}
Expand Down
7 changes: 5 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ services:
- db-data:/var/lib/postgresql/data

db-admin:
image: dpage/pgadmin4
image: elestio/pgadmin
environment:
PGADMIN_DEFAULT_EMAIL: pg@pg.cc
PGADMIN_DEFAULT_PASSWORD: pg
PGADMIN_LISTEN_PORT: 8080
ports:
- "5433:80"
- "5433:8080"
volumes:
- db-data:/pgadmin4/servers.json

volumes:
db-data:
Loading