Skip to content

Commit 1116f6c

Browse files
committed
Convert from java.jdbc to next.jdbc
1 parent 2d09602 commit 1116f6c

File tree

12 files changed

+431
-439
lines changed

12 files changed

+431
-439
lines changed

db-importer/src/clojars/db_import.clj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
(ns clojars.db-import
22
(:require
3-
[clojure.java.jdbc :as jdbc]
3+
[clojars.db :as db]
44
[clojure.set :as set]
5-
[clojure.walk :as walk]))
5+
[clojure.walk :as walk]
6+
[next.jdbc.sql :as sql]))
67

78
(def tables
89
[:users
@@ -12,13 +13,13 @@
1213

1314
(defn select-all
1415
[db table]
15-
(jdbc/query
16+
(sql/query
1617
db
1718
[(format "select * from %s" (name table))]))
1819

1920
(defn clear-psql-db
2021
[psql-db]
21-
(jdbc/db-do-commands
22+
(db/do-commands
2223
psql-db
2324
(mapv
2425
#(format "delete from %s" (name %))
@@ -79,15 +80,15 @@
7980
[db table data]
8081
(doseq [chunk (partition-all 10000 data)]
8182
(printf "==> inserting batch of %s\n" (count chunk))
82-
(jdbc/insert-multi! db table
83-
(map translate-row chunk))))
83+
(sql/insert-multi! db table
84+
(map translate-row chunk))))
8485

8586
(defn existing-ids
8687
[db table]
87-
(set
88-
(jdbc/query db
89-
[(format "select id from %s" (name table))]
90-
{:row-fn :id})))
88+
(into #{}
89+
(map :id)
90+
(sql/query db
91+
[(format "select id from %s" (name table))])))
9192

9293
(defn -main
9394
[& [sqlite-db-path pg-host pg-port pg-user pg-password :as args]]

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
com.cognitect.aws/ssm {:mvn/version "847.2.1365.0"}
2929
com.github.scribejava/scribejava-apis {:mvn/version "8.3.1"}
3030
com.github.seancorfield/honeysql {:mvn/version "2.4.1078"}
31+
com.github.seancorfield/next.jdbc {:mvn/version "1.3.894"}
3132
com.stuartsierra/component {:mvn/version "0.3.1"}
3233

3334
digest/digest {:mvn/version "1.4.10"}
@@ -50,7 +51,6 @@
5051
org.apache.maven/maven-model {:mvn/version "3.8.4"}
5152
org.apache.maven/maven-repository-metadata {:mvn/version "3.8.4"}
5253
org.clojure/clojure {:mvn/version "1.11.1"}
53-
org.clojure/java.jdbc {:mvn/version "0.7.12"}
5454
org.clojure/tools.logging {:mvn/version "1.2.4"}
5555
org.clojure/tools.nrepl {:mvn/version "0.2.11"}
5656
org.postgresql/postgresql {:mvn/version "42.6.0"}

0 commit comments

Comments
 (0)