Upgrading and removing internal dependency on interface.

techascent · Mar 12, 2024 · 857dbd2 · 857dbd2
1 parent f82ca73
commit 857dbd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/deps.edn b/deps.edn
@@ -5,7 +5,7 @@
                 ;;Various users of the tmd system are still on jdk-8
                 com.microsoft.sqlserver/mssql-jdbc {:mvn/version "9.4.1.jre8"}
                 seancorfield/next.jdbc     {:mvn/version "1.0.424"}
-                techascent/tech.ml.dataset {:mvn/version "7.000-beta-3"}}
+                techascent/tech.ml.dataset {:mvn/version "7.028"}}
    :extra-paths ["test"]}
   :test
   {:extra-deps {com.cognitect/test-runner
@@ -20,7 +20,7 @@
    :exec-fn hf.depstar/jar
    :exec-args {:group-id "techascent"
                :artifact-id "tech.ml.dataset.sql"
-               :version "6.047-SNAPSHOT"
+               :version "7.029-SNAPSHOT"
                :sync-pom true
                :jar "target/tech.ml.dataset.sql.jar"}}
   ;;deploy to clojars

diff --git a/src/tech/v3/dataset/sql.clj b/src/tech/v3/dataset/sql.clj
@@ -110,7 +110,6 @@ _unnamed [5 3]:
            [java.time Instant LocalDate LocalTime]
            [java.sql Connection ResultSetMetaData PreparedStatement
             DatabaseMetaData ResultSet ParameterMetaData Timestamp Time Date]
-           [tech.v3.dataset.io.column_parsers PParser]
            [tech.v3.dataset Text]))
 
 
@@ -778,7 +777,7 @@ via the options map or as the key :primary-key in the dataset metadata")))
         (->> col-data
              (map (fn [{:keys [name read-fn col-idx datatype
                                result-set-metadata]}]
-                    (let [^PParser parser
+                    (let [parser
                           (if datatype
                             (col-parsers/make-fixed-parser name datatype nil)
                             (col-parsers/promotional-object-parser name nil))
@@ -787,9 +786,9 @@ via the options map or as the key :primary-key in the dataset metadata")))
                         ([row-idx]
                          (let [cval (read-fn)]
                            (when-not (.wasNull rs)
-                             (.addValue parser row-idx cval))))
+                             (col-parsers/add-value! parser row-idx cval))))
                         ([n-rows n-rows]
-                         (-> (.finalize parser n-rows)
+                         (-> (col-parsers/finalize! parser n-rows)
                              (assoc :tech.v3.dataset/name name
                                     :tech.v3.dataset/metadata {:result-set-metadata
                                                                result-set-metadata})))))))