start server on standard psql port

Author: mpisanko

src/clj/xt_play/config.clj

@@ -1,9 +1,15 @@
 (ns xt-play.config)
 
+(def pgwire-port 5432)
+
 (def db
   {:dbtype "postgresql"
    :dbname "xtdb"
    :user "xtdb"
    :password "xtdb"
    :host "localhost"
-   :port 5432})
+   :port pgwire-port})
+
+(def node-config
+  {:server
+   {:port pgwire-port}})

src/clj/xt_play/lambda.clj

@@ -7,13 +7,14 @@
             [clojure.string :as str]
             [xtdb.api :as xt]
             [xtdb.node :as xtn]
+            [xt-play.config :as config]
             [xt-play.base64 :as b64]
             [xt-play.handler :as h]))
 
 (defn -init []
   ; NOTE: This ensure xtdb is warmed up before starting the server
   ;       Otherwise, the first few requests will time out
-  (with-open [node (xtn/start-node {})]
+  (with-open [node (xtn/start-node config/node-config)]
     (xt/status node))
   [[] nil])
 

src/clj/xt_play/server.clj

@@ -2,14 +2,15 @@
   (:require [clojure.tools.logging :as log]
             [integrant.core :as ig]
             [ring.adapter.jetty :as jetty]
+            [xt-play.config :as config]
             [xtdb.api :as xt]
             [xtdb.node :as xtn]))
 
 (defn start
   [{:keys [join port handler] :or {port 8000}}]
   ; NOTE: This ensure xtdb is warmed up before starting the server
   ;       Otherwise, the first few requests will fail
-  (with-open [node (xtn/start-node {})]
+  (with-open [node (xtn/start-node config/node-config)]
     (xt/status node))
   (let [server (jetty/run-jetty handler
                                 {:port port, :join? join})]

src/clj/xt_play/xtdb.clj

@@ -8,7 +8,7 @@
 
 (defn with-xtdb [f]
   (try
-    (with-open [node (xtn/start-node {})]
+    (with-open [node (xtn/start-node {:server {:port (:port config/db)}})]
       (f node))
     (catch Exception e
       (log/warn :submit-error {:e e})
@@ -32,13 +32,13 @@
   (with-open [conn (jdbc/get-connection config/db)]
     (f conn)))
 
-(defn jdbc-execute! 
+(defn jdbc-execute!
   [conn statement]
   (log/info :jdbc-execute! statement)
   (jdbc/execute! conn statement {:builder-fn jdbc-res/as-arrays}))
 
 (comment
-  (with-open [node (xtn/start-node {})]
+  (with-open [node (xtn/start-node config/node-config)]
     (doseq [st [#inst "2022" #inst "2021"]]
       (let [tx (xt/submit-tx node [] {:system-time st})
             results (xt/q node '(from :xt/txs [{:xt/id $tx-id} xt/error])

src/cljc/xt_play/util.cljc

@@ -1,5 +1,5 @@
 (ns xt-play.util
-  (:require #?(:clj [clojure.edn :as edn])))
+  #?(:clj (:require [clojure.edn :as edn])))
 
 #?(:clj
    (def xt-version

test/clj/xt_play/handler_test.clj

@@ -1,10 +1,13 @@
 (ns xt-play.handler-test
-  (:require [clojure.edn :as edn]
-            [clojure.string :as str]
-            [clojure.test :as t]
-            [clojure.data.json :as json]
-            [xt-play.handler :as h]
-            [xt-play.xtdb-stubs :refer [with-stubs db clean-db mock-resp reset-resp]]))
+  (:require
+   [clojure.data.json :as json]
+   [clojure.edn :as edn]
+   [clojure.string :as str]
+   [clojure.test :as t]
+   [xt-play.handler :as h]
+   #_:clj-kondo/ignore
+   [time-literals.data-readers :as time]
+   [xt-play.xtdb-stubs :refer [clean-db db mock-resp reset-resp with-stubs]]))
 ;; todo:
 ;; [ ] test unhappy paths
 ;; [ ] test wider range of scenarios / formats
@@ -16,7 +19,7 @@
 
 (defn- t-file [path]
   (edn/read-string (slurp (format "test-resources/%s.edn" path))))
-#_
+
 (t/deftest run-handler-test
   (with-stubs
     #(do
@@ -35,7 +38,7 @@
          (h/run-handler (t-file "sql-example-request"))
          (let [[txs query] @db]
            (t/is (= 2 (count @db)))
-           (t/is (= [[:sql "INSERT INTO docs (_id, col1) VALUES (1, 'foo')"]          
+           (t/is (= [[:sql "INSERT INTO docs (_id, col1) VALUES (1, 'foo')"]
                      [:sql "
 INSERT INTO docs RECORDS {_id: 2, col1: 'bar', col2:' baz'}"]]
                   txs))
@@ -152,16 +155,16 @@ INSERT INTO docs RECORDS {_id: 2, col1: 'bar', col2:' baz'};"]
        (mock-resp [{"_id" 1,
                     "name" "An Electric Bicycle",
                     "price" 350,
-                    "_valid_from" #time/zoned-date-time "2024-01-10T00:00Z[UTC]"}
+                    "_valid_from" #time/zoned-date-time "2024-01-10T00:00Z"}
                    {"_id" 1,
                     "name" "An Electric Bicycle",
                     "price" 405,
-                    "_valid_from" #time/zoned-date-time "2024-01-05T00:00Z[UTC]"}
+                    "_valid_from" #time/zoned-date-time "2024-01-05T00:00Z"}
                    {"_id" 1,
                     "name" "An Electric Bicycle",
                     "price" 400,
-                    "_valid_from" #time/zoned-date-time "2024-01-01T00:00Z[UTC]"}])
-       
+                    "_valid_from" #time/zoned-date-time "2024-01-01T00:00Z"}])
+
        (let [response (h/docs-run-handler {:parameters {:body (json/read-str docs-json :key-fn keyword)}})
              txs (drop-last @db)
              query (last @db)]
@@ -173,7 +176,7 @@ INSERT INTO docs RECORDS {_id: 2, col1: 'bar', col2:' baz'};"]
 
          (t/is (= "SELECT *, _valid_from\nFROM product\nFOR VALID_TIME ALL -- i.e. \"show me all versions\"\nFOR SYSTEM_TIME AS OF DATE '2024-01-31' -- \"...as observed at month end\""
                   query))
-         
+
          (t/testing "docs run returns map results"
            (t/is (every? map? (:body response))))
 
@@ -183,13 +186,13 @@ INSERT INTO docs RECORDS {_id: 2, col1: 'bar', col2:' baz'};"]
                      [{"_id" 1,
                        "name" "An Electric Bicycle",
                        "price" 350,
-                       "_valid_from" #time/zoned-date-time "2024-01-10T00:00Z[UTC]"}
+                       "_valid_from" #time/zoned-date-time "2024-01-10T00:00Z"}
                       {"_id" 1,
                        "name" "An Electric Bicycle",
                        "price" 405,
-                       "_valid_from" #time/zoned-date-time "2024-01-05T00:00Z[UTC]"}
+                       "_valid_from" #time/zoned-date-time "2024-01-05T00:00Z"}
                       {"_id" 1,
                        "name" "An Electric Bicycle",
                        "price" 400,
-                       "_valid_from" #time/zoned-date-time "2024-01-01T00:00Z[UTC]"}]}
+                       "_valid_from" #time/zoned-date-time "2024-01-01T00:00Z"}]}
                     response)))))))