From 080c60c08e6149e283d4650d68aac2644d05b50f Mon Sep 17 00:00:00 2001 From: Nik Date: Sun, 28 Nov 2021 16:36:42 +0800 Subject: [PATCH] [#1081] make next.jdbc's result-set namespace accessible from babashka (#1082) --- feature-jdbc/babashka/impl/jdbc.clj | 12 ++++++++++++ src/babashka/main.clj | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/feature-jdbc/babashka/impl/jdbc.clj b/feature-jdbc/babashka/impl/jdbc.clj index 2d754622..a9a4a3bc 100644 --- a/feature-jdbc/babashka/impl/jdbc.clj +++ b/feature-jdbc/babashka/impl/jdbc.clj @@ -1,6 +1,7 @@ (ns babashka.impl.jdbc {:no-doc true} (:require [next.jdbc :as njdbc] + [next.jdbc.result-set :as rs] [next.jdbc.sql :as sql] [sci.impl.namespaces :refer [copy-var macrofy]] [sci.impl.vars :as vars])) @@ -34,3 +35,14 @@ (def next-sql-namespace {'insert-multi! (copy-var sql/insert-multi! sns)}) + +(def rsns (vars/->SciNamespace 'next.jdbc.result-set nil)) + +(def result-set-namespace + {'as-maps (copy-var rs/as-maps rsns) + 'as-unqualified-maps (copy-var rs/as-unqualified-maps rsns) + 'as-modified-maps (copy-var rs/as-modified-maps rsns) + 'as-unqualified-modified-maps (copy-var rs/as-unqualified-modified-maps rsns) + 'as-lower-maps (copy-var rs/as-lower-maps rsns) + 'as-unqualified-lower-maps (copy-var rs/as-unqualified-lower-maps rsns) + 'as-maps-adapter (copy-var rs/as-maps-adapter rsns)}) diff --git a/src/babashka/main.clj b/src/babashka/main.clj index b947a50c..0245d172 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -372,7 +372,8 @@ Use bb run --help to show this help output. features/yaml? (assoc 'clj-yaml.core @(resolve 'babashka.impl.yaml/yaml-namespace) 'flatland.ordered.map @(resolve 'babashka.impl.ordered/ordered-map-ns)) features/jdbc? (assoc 'next.jdbc @(resolve 'babashka.impl.jdbc/njdbc-namespace) - 'next.jdbc.sql @(resolve 'babashka.impl.jdbc/next-sql-namespace)) + 'next.jdbc.sql @(resolve 'babashka.impl.jdbc/next-sql-namespace) + 'next.jdbc.result-set @(resolve 'babashka.impl.jdbc/result-set-namespace)) features/csv? (assoc 'clojure.data.csv @(resolve 'babashka.impl.csv/csv-namespace)) features/transit? (assoc 'cognitect.transit @(resolve 'babashka.impl.transit/transit-namespace)) features/datascript? (assoc 'datascript.core @(resolve 'babashka.impl.datascript/datascript-namespace))