luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more xtdb test progress

Browse source 
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2024-11-24 00:26:41 -08:00
parent 0c50cf28b5
commit 5f0c93642a
No known key found for this signature in database
4 changed files with 105 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
test/next/jdbc/datafy_test.clj
View file

@ -2,16 +2,17 @@
(ns next.jdbc.datafy-test (ns next.jdbc.datafy-test
"Tests for the datafy extensions over JDBC types." "Tests for the datafy extensions over JDBC types."
(:require [clojure.datafy :as d] (:require
[clojure.set :as set] [clojure.datafy :as d]
[clojure.test :refer [deftest is testing use-fixtures]] [clojure.set :as set]
[next.jdbc :as jdbc] [clojure.test :refer [deftest is testing use-fixtures]]
[next.jdbc.datafy] [next.jdbc :as jdbc]
[next.jdbc.result-set :as rs] [next.jdbc.datafy]
[next.jdbc.specs :as specs] [next.jdbc.result-set :as rs]
[next.jdbc.test-fixtures [next.jdbc.specs :as specs]
:refer [with-test-db db ds [next.jdbc.test-fixtures
derby? jtds? mysql? postgres? sqlite?]])) :refer [db derby? ds jtds? mysql? postgres? sqlite? with-test-db
xtdb?]]))
(set! *warn-on-reflection* true) (set! *warn-on-reflection* true)
@ -83,6 +84,26 @@
:rowIdLifetime/exception)) :rowIdLifetime/exception))
(postgres?) (-> (disj :rowIdLifetime) (postgres?) (-> (disj :rowIdLifetime)
(conj :rowIdLifetime/exception)) (conj :rowIdLifetime/exception))
(xtdb?) (-> (disj :clientInfoProperties
:defaultTransactionIsolation
:maxCatalogNameLength
:maxColumnNameLength
:maxCursorNameLength
:maxProcedureNameLength
:maxSchemaNameLength
:maxTableNameLength
:maxUserNameLength
:rowIdLifetime)
(conj :clientInfoProperties/exception
:defaultTransactionIsolation/exception
:maxCatalogNameLength/exception
:maxColumnNameLength/exception
:maxCursorNameLength/exception
:maxProcedureNameLength/exception
:maxSchemaNameLength/exception
:maxTableNameLength/exception
:maxUserNameLength/exception
:rowIdLifetime/exception))
(sqlite?) (-> (disj :clientInfoProperties :rowIdLifetime) (sqlite?) (-> (disj :clientInfoProperties :rowIdLifetime)
(conj :clientInfoProperties/exception (conj :clientInfoProperties/exception
:rowIdLifetime/exception))) :rowIdLifetime/exception)))
@ -97,7 +118,8 @@
(let [data (d/datafy (.getMetaData con))] (let [data (d/datafy (.getMetaData con))]
(doseq [k (cond-> #{:catalogs :clientInfoProperties :schemas :tableTypes :typeInfo} (doseq [k (cond-> #{:catalogs :clientInfoProperties :schemas :tableTypes :typeInfo}
(jtds?) (disj :clientInfoProperties) (jtds?) (disj :clientInfoProperties)
(sqlite?) (disj :clientInfoProperties))] (sqlite?) (disj :clientInfoProperties)
(xtdb?) (disj :clientInfoProperties))]
(let [rs (d/nav data k nil)] (let [rs (d/nav data k nil)]
(is (vector? rs)) (is (vector? rs))
(is (every? map? rs)))))))) (is (every? map? rs))))))))
@ -122,4 +144,25 @@
(.execute ps) (.execute ps)
(.getResultSet ps) (.getResultSet ps)
(.close ps) (.close ps)
(.close con)) (.close con)
#{
}
(= #{:driverMinorVersion :numericFunctions :catalogTerm :maxStatements :maxIndexLength :maxColumnsInOrderBy
:maxBinaryLiteralLength :driverName :procedureTerm :all-tables :SQLStateType :maxCharLiteralLength :JDBCMajorVersion
:catalogs :maxColumnsInTable :timeDateFunctions
:maxConnections
:systemFunctions :databaseMajorVersion :databaseProductVersion :JDBCMinorVersion :schemas :readOnly :driverVersion :class :maxTablesInSelect :maxColumnsInGroupBy
:identifierQuoteString :maxColumnsInIndex :driverMajorVersion :typeInfo :tableTypes
:maxRowSize :stringFunctions :resultSetHoldability
:SQLKeywords :searchStringEscape :URL :databaseProductName :catalogSeparator
:connection :catalogAtStart :maxStatementLength :extraNameCharacters :userName :databaseMinorVersion :maxColumnsInSelect :schemaTerm
}
#{:driverMinorVersion :numericFunctions :catalogTerm :maxStatements :maxIndexLength :maxColumnsInOrderBy
:maxBinaryLiteralLength :driverName :procedureTerm :all-tables :SQLStateType :maxCharLiteralLength :JDBCMajorVersion
:catalogs :maxColumnsInTable :timeDateFunctions
:maxConnections
:systemFunctions :databaseMajorVersion :databaseProductVersion :JDBCMinorVersion :schemas :readOnly :driverVersion :class :maxTablesInSelect :maxColumnsInGroupBy
:identifierQuoteString :maxColumnsInIndex :driverMajorVersion :typeInfo :tableTypes
:maxRowSize :stringFunctions :resultSetHoldability
:SQLKeywords :searchStringEscape :URL :databaseProductName :catalogSeparator
:connection :catalogAtStart :maxStatementLength :extraNameCharacters :userName :databaseMinorVersion :maxColumnsInSelect :schemaTerm}))

61
test/next/jdbc/defer_test.clj
View file

@ -15,39 +15,40 @@
[next.jdbc :as jdbc] [next.jdbc :as jdbc]
[next.jdbc.defer :as sut] [next.jdbc.defer :as sut]
[next.jdbc.test-fixtures [next.jdbc.test-fixtures
:refer [ds with-test-db]])) :refer [ds with-test-db xtdb?]]))
(set! *warn-on-reflection* true) (set! *warn-on-reflection* true)
(use-fixtures :once with-test-db) (use-fixtures :once with-test-db)
(deftest basic-test (deftest basic-test
(testing "data structures" (when-not (xtdb?)
(is (= [{:sql-p ["INSERT INTO foo (name) VALUES (?)" "Sean"] (testing "data structures"
:key-fn :GENERATED_KEY (is (= [{:sql-p ["INSERT INTO foo (name) VALUES (?)" "Sean"]
:key :id :key-fn :GENERATED_KEY
:opts {:key-fn :GENERATED_KEY :key :id}}] :key :id
@(sut/defer-ops :opts {:key-fn :GENERATED_KEY :key :id}}]
#(sut/insert! :foo {:name "Sean"} {:key-fn :GENERATED_KEY :key :id}))))) @(sut/defer-ops
(testing "execution" #(sut/insert! :foo {:name "Sean"} {:key-fn :GENERATED_KEY :key :id})))))
(let [effects (sut/with-deferred (ds) (testing "execution"
(sut/insert! :fruit {:name "Mango"} {:key :test}))] (let [effects (sut/with-deferred (ds)
(is (= {:test 1} @effects)) (sut/insert! :fruit {:name "Mango"} {:key :test}))]
(is (= 1 (count (jdbc/execute! (ds) (is (= {:test 1} @effects))
["select * from fruit where name = ?" (is (= 1 (count (jdbc/execute! (ds)
"Mango"]))))) ["select * from fruit where name = ?"
(let [effects (sut/with-deferred (ds) "Mango"])))))
(sut/insert! :fruit {:name "Dragonfruit"} {:key :test}) (let [effects (sut/with-deferred (ds)
(sut/update! :fruit {:cost 123} {:name "Dragonfruit"}) (sut/insert! :fruit {:name "Dragonfruit"} {:key :test})
(sut/delete! :fruit {:name "Dragonfruit"}))] (sut/update! :fruit {:cost 123} {:name "Dragonfruit"})
(is (= {:test 1} @effects)) (sut/delete! :fruit {:name "Dragonfruit"}))]
(is (= 0 (count (jdbc/execute! (ds) (is (= {:test 1} @effects))
["select * from fruit where name = ?" (is (= 0 (count (jdbc/execute! (ds)
"Dragonfruit"]))))) ["select * from fruit where name = ?"
(let [effects (sut/with-deferred (ds) "Dragonfruit"])))))
(sut/insert! :fruit {:name "Grapefruit" :bad_column 0} {:key :test}))] (let [effects (sut/with-deferred (ds)
(is (= :failed (try @effects (sut/insert! :fruit {:name "Grapefruit" :bad_column 0} {:key :test}))]
(catch Exception _ :failed)))) (is (= :failed (try @effects
(is (= 0 (count (jdbc/execute! (ds) (catch Exception _ :failed))))
["select * from fruit where name = ?" (is (= 0 (count (jdbc/execute! (ds)
"Grapefruit"]))))))) ["select * from fruit where name = ?"
"Grapefruit"]))))))))

11
test/next/jdbc/sql_test.clj
View file

@ -114,7 +114,10 @@
(mssql?) :GENERATED_KEYS (mssql?) :GENERATED_KEYS
(mysql?) :GENERATED_KEY (mysql?) :GENERATED_KEY
(postgres?) :fruit/id (postgres?) :fruit/id
(xtdb?) :_id ;; XTDB does not return the generated key so we fix it
;; to be the one we insert here, and then fake it in all
;; the other tests.
(xtdb?) (constantly 5)
:else :FRUIT/ID)] :else :FRUIT/ID)]
(testing "single insert/delete" (testing "single insert/delete"
(is (== 5 (new-key (doto (is (== 5 (new-key (doto
@ -139,6 +142,8 @@
[8M] [8M]
(maria?) (maria?)
[6] [6]
(xtdb?)
[]
:else :else
[6 7 8]) [6 7 8])
(mapv new-key (mapv new-key
@ -167,6 +172,8 @@
[11M] [11M]
(maria?) (maria?)
[9] [9]
(xtdb?)
[]
:else :else
[9 10 11]) [9 10 11])
(mapv new-key (mapv new-key
@ -195,6 +202,8 @@
[14M] [14M]
(maria?) (maria?)
[12] [12]
(xtdb?)
[]
:else :else
[12 13 14]) [12 13 14])
(mapv new-key (mapv new-key

15
test/next/jdbc_test.clj
View file

@ -120,8 +120,9 @@
(when (xtdb?) (println (first rs) (when (xtdb?) (println (first rs)
(.indexOf ^java.util.List (first rs) :name) (.indexOf ^java.util.List (first rs) :name)
(.indexOf (first rs) :name))) (.indexOf (first rs) :name)))
(let [n (.indexOf ^java.util.List (first rs) :name)] (let [n (or (.indexOf ^java.util.List (first rs) :name) 1)]
(is (every? string? (map #(nth % n) (rest rs))))))) (is (try (every? string? (map #(nth % n) (rest rs)))
(catch Throwable _ (println (rest rs))))))))
(testing "execute! with adapter" (testing "execute! with adapter"
(let [rs (jdbc/execute! ; test again, with adapter and lower columns (let [rs (jdbc/execute! ; test again, with adapter and lower columns
ds-opts ds-opts
@ -142,8 +143,9 @@
(when (xtdb?) (println (first rs) (when (xtdb?) (println (first rs)
(.indexOf ^java.util.List (first rs) :name) (.indexOf ^java.util.List (first rs) :name)
(.indexOf (first rs) :name))) (.indexOf (first rs) :name)))
(let [n (.indexOf ^java.util.List (first rs) :name)] (let [n (or (.indexOf ^java.util.List (first rs) :name) 1)]
(is (every? string? (map #(nth % n) (rest rs))))))) (is (try (every? string? (map #(nth % n) (rest rs)))
(catch Throwable _ (println (rest rs))))))))
(testing "execute! with unqualified" (testing "execute! with unqualified"
(let [rs (jdbc/execute! (let [rs (jdbc/execute!
(ds) (ds)
@ -170,8 +172,9 @@
(when (xtdb?) (println (first rs) (when (xtdb?) (println (first rs)
(.indexOf ^java.util.List (first rs) :name) (.indexOf ^java.util.List (first rs) :name)
(.indexOf (first rs) :name))) (.indexOf (first rs) :name)))
(let [n (.indexOf ^java.util.List (first rs) :name)] (let [n (or (.indexOf ^java.util.List (first rs) :name) 1)]
(is (every? string? (map #(nth % n) (rest rs))))))) (is (try (every? string? (map #(nth % n) (rest rs)))
(catch Throwable _ (println (rest rs))))))))
(testing "execute! with :max-rows / :maxRows" (testing "execute! with :max-rows / :maxRows"
(let [rs (jdbc/execute! (let [rs (jdbc/execute!
ds-opts ds-opts