From be9e4a6a55b95b60ab03b356cb1d605c1beba91d Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 1 Apr 2019 23:32:24 -0700 Subject: [PATCH] Rename protocols For internal consistency and also to avoid confusion with `clojure.java.jdbc` protocols. --- src/next/jdbc/prepare.clj | 4 ++-- src/next/jdbc/result_set.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/next/jdbc/prepare.clj b/src/next/jdbc/prepare.clj index fb52edb..f476da3 100644 --- a/src/next/jdbc/prepare.clj +++ b/src/next/jdbc/prepare.clj @@ -14,7 +14,7 @@ (set! *warn-on-reflection* true) -(defprotocol ISQLParameter :extend-via-metadata true +(defprotocol SettableParameter :extend-via-metadata true "Protocol for setting SQL parameters in statement objects, which can convert from Clojure values. The default implementation just calls .setObject on the parameter value. It can be extended to use other @@ -23,7 +23,7 @@ "Convert a Clojure value into a SQL value and store it as the ix'th parameter in the given SQL statement object.")) -(extend-protocol ISQLParameter +(extend-protocol SettableParameter Object (set-parameter [v ^PreparedStatement s ^long i] (.setObject s i v)) diff --git a/src/next/jdbc/result_set.clj b/src/next/jdbc/result_set.clj index f586760..5da012b 100644 --- a/src/next/jdbc/result_set.clj +++ b/src/next/jdbc/result_set.clj @@ -36,7 +36,7 @@ (column-names [this] "Return the column names from a result set.") (row-values [this] "Return the values from the current row of a result set.")) -(defprotocol IReadColumn +(defprotocol ReadableColumn "Protocol for reading objects from the java.sql.ResultSet. Default implementations (for Object and nil) return the argument, and the Boolean implementation ensures a canonicalized true/false value, @@ -46,7 +46,7 @@ (read-column-by-index [val rsmeta idx] "Function for transforming values after reading them via a column index.")) -(extend-protocol IReadColumn +(extend-protocol ReadableColumn Object (read-column-by-label [x _] x) (read-column-by-index [x _2 _3] x)