We can insert!
Arne Brasseur
1 year ago
parent
ee55ba5c9b
commit
9bdd84273e
@ -0,0 +1,32 @@
|
||||
(ns repl-sessions.second-stream
|
||||
(:require [lambdaisland.souk.db :as db]
|
||||
[lambdaisland.souk.activitypub :as ap]
|
||||
[lambdaisland.souk.sql :as sql]
|
||||
[next.jdbc :as jdbc]))
|
||||
|
||||
(let [{:keys [schema ds]} (user/value :storage/db)
|
||||
table :activitystreams/Actor
|
||||
person (ap/GET "https://toot.cat/users/plexus/")]
|
||||
#_
|
||||
(jdbc/execute! ds
|
||||
(db/insert-sql table
|
||||
(select-keys person (get schema table))
|
||||
(apply dissoc person :rdf/type (get schema table))))
|
||||
[(select-keys person (get schema table))
|
||||
(apply dissoc person :rdf/type (get schema table))]
|
||||
)
|
||||
|
||||
(count
|
||||
{:rdf/type :activitystreams/Person,
|
||||
:rdf/id "https://toot.cat/users/plexus",
|
||||
:activitystreams/published
|
||||
"2017-04-11T00:00Z",
|
||||
:activitystreams/outbox "https://toot.cat/users/plexus/outbox",
|
||||
:activitystreams/name "Arne Brasseur",
|
||||
:activitystreams/summary
|
||||
"<p>Founder of Gaiwan.co — creator of Kaocha — drinks tea and writes Clojure, in that order.</p><p>Alts: <span class=\"h-card\"><a href=\"https://mastodon.social/@plexus\" class=\"u-url mention\">@<span>plexus</span></a></span> / <span class=\"h-card\"><a href=\"https://toot.berlin/@plexus\" class=\"u-url mention\">@<span>plexus</span></a></span></p>",
|
||||
:activitystreams/preferredUsername "plexus",
|
||||
:activitystreams/url "https://toot.cat/@plexus",
|
||||
:ldp/inbox "https://toot.cat/users/plexus/inbox"})
|
||||
|
||||
(jdbc/execute! (:ds (user/value :storage/db)) [(sql/sql 'drop-table :activitystreams/Actor)])
|
||||
@ -1 +1,2 @@
|
||||
{:dev/reload-routes? true}
|
||||
{:dev/reload-routes? true
|
||||
:jdbc/url "jdbc:pgsql://localhost:5432/souk?user=postgres"}
|
||||
|
||||
@ -0,0 +1,100 @@
|
||||
(ns lambdaisland.souk.db
|
||||
(:require [lambdaisland.souk.sql :as sql]
|
||||
[next.jdbc :as jdbc]
|
||||
[next.jdbc.date-time :as jdbc-date-time]
|
||||
[next.jdbc.plan]
|
||||
[next.jdbc.result-set :as rs]
|
||||
[next.jdbc.sql :as nsql]
|
||||
[cheshire.core :as json]
|
||||
[lambdaisland.glogc :as log])
|
||||
(:import (com.mchange.v2.c3p0 ComboPooledDataSource)))
|
||||
|
||||
(def default-properties
|
||||
[[:rdf/id 'text 'primary-key]
|
||||
[:rdf/type 'text]
|
||||
[:rdf/props 'jsonb 'default "{}"]
|
||||
[:meta/created-at 'timestamp-with-time-zone 'default [:fn 'now] 'not-null]
|
||||
[:meta/updated-at 'timestamp-with-time-zone]])
|
||||
|
||||
(def set-ts-trigger-def "CREATE OR REPLACE FUNCTION trigger_set_timestamp()\nRETURNS TRIGGER AS $$\nBEGIN\n NEW.\"meta/updated-at\" = NOW();\n RETURN NEW;\nEND;\n$$ LANGUAGE plpgsql;")
|
||||
|
||||
(def tables
|
||||
[[:activitystreams/Actor
|
||||
[[:activitystreams/name 'text 'not-null]
|
||||
[:activitystreams/preferredUsername 'text 'not-null]
|
||||
[:activitystreams/url 'text 'not-null]
|
||||
[:activitystreams/summary 'text]
|
||||
[:ldp/inbox 'text 'not-null]
|
||||
[:activitystreams/outbox 'text 'not-null]
|
||||
[:activitystreams/published 'timestamp-with-time-zone]]]])
|
||||
|
||||
(defn create-table! [ds table-name columns]
|
||||
(log/info :table/creating {:name table-name :columns columns})
|
||||
(jdbc/execute! ds [(sql/sql 'create-table 'if-not-exists table-name
|
||||
(concat
|
||||
default-properties
|
||||
columns))])
|
||||
(jdbc/execute! ds [(sql/sql 'drop-trigger 'if-exists :set-timestamp
|
||||
'on table-name)])
|
||||
(jdbc/execute! ds [(sql/sql 'create-trigger :set-timestamp
|
||||
'before-update
|
||||
'on table-name
|
||||
'for-each-row
|
||||
'execute-procedure [:fn 'trigger_set_timestamp])]))
|
||||
|
||||
(defn pg-coerce [val]
|
||||
(cond
|
||||
(instance? java.time.ZonedDateTime val)
|
||||
(.toOffsetDateTime val)
|
||||
:else
|
||||
val))
|
||||
|
||||
(defn insert-sql [table entity props]
|
||||
(into [(sql/sql 'insert-into table
|
||||
(cons :rdf/props
|
||||
(map key entity))
|
||||
'values
|
||||
(repeat (inc (count entity)) '?)
|
||||
'on-conflict [:raw "(\"rdf/id\")"]
|
||||
'do
|
||||
'update-set
|
||||
(into [:commas]
|
||||
(map (fn [[k]]
|
||||
[k '= '?]))
|
||||
entity))]
|
||||
(cons
|
||||
(json/encode props)
|
||||
(concat
|
||||
(map (comp pg-coerce val) props)
|
||||
(map (comp pg-coerce val) props)))))
|
||||
|
||||
(defn start! [{:keys [props]}]
|
||||
(let [ds (doto (ComboPooledDataSource.)
|
||||
(.setDriverClass "com.impossibl.postgres.jdbc.PGDriver")
|
||||
(.setJdbcUrl (:url props)))]
|
||||
(jdbc/execute! ds [set-ts-trigger-def])
|
||||
(doseq [[table columns] tables]
|
||||
(create-table! ds table columns))
|
||||
(let [table-columns
|
||||
(into {}
|
||||
(with-open [con (jdbc/get-connection ds {})]
|
||||
(let [md (.getMetaData con)]
|
||||
(doall
|
||||
(for [{:keys [pg_class/TABLE_NAME]}
|
||||
(-> md
|
||||
(.getTables nil nil nil (into-array ["TABLE" "VIEW"]))
|
||||
(rs/datafiable-result-set ds {}))]
|
||||
[(keyword TABLE_NAME)
|
||||
(map (comp keyword :COLUMN_NAME)
|
||||
(rs/datafiable-result-set (.getColumns md nil nil TABLE_NAME nil) ds {}))])))))]
|
||||
{:schema table-columns
|
||||
:ds ds})))
|
||||
|
||||
(defn stop! [{ds :value}]
|
||||
#_(.close ds))
|
||||
|
||||
;; cpds.setUser("dbuser");
|
||||
;; cpds.setPassword("dbpassword");
|
||||
(def component
|
||||
{:gx/start {:gx/processor #'start!}
|
||||
:gx/stop {:gx/processor #'stop!}})
|
||||
@ -0,0 +1,56 @@
|
||||
(ns lambdaisland.souk.sql
|
||||
(:require [clojure.string :as str]))
|
||||
|
||||
(defn sql-ident [v]
|
||||
(if (sequential? v)
|
||||
(str/join "." (map sql-ident v))
|
||||
(str "\""
|
||||
(if (keyword? v)
|
||||
(subs (str v) 1)
|
||||
v)
|
||||
"\"")))
|
||||
|
||||
(defn sql-kw [k]
|
||||
(str/upper-case
|
||||
(str/replace
|
||||
(if (keyword? k)
|
||||
(name k)
|
||||
k)
|
||||
#"-" " ")))
|
||||
|
||||
(defn sql-str [& ss]
|
||||
(str "'" (str/replace (apply str ss) #"'" "''") "'"))
|
||||
|
||||
(defn sql-list
|
||||
([items]
|
||||
(sql-list "(" ")" ", " items))
|
||||
([before after separator items]
|
||||
(str before (apply str (str/join separator items)) after)))
|
||||
|
||||
(defn strs [& items]
|
||||
(str/join " " items))
|
||||
|
||||
(defn sql [& items]
|
||||
(apply strs
|
||||
(map (fn [x]
|
||||
(cond
|
||||
(vector? x)
|
||||
(case (first x)
|
||||
:ident (sql-ident (second x))
|
||||
:kw (sql-kw (second x))
|
||||
:str (sql-str (second x))
|
||||
:raw (second x)
|
||||
:list (sql-list (map sql (next x)))
|
||||
:commas (sql-list "" "" ", " (map sql (next x)))
|
||||
:fn (str (second x)
|
||||
(sql-list (map sql (nnext x))))
|
||||
(apply sql x))
|
||||
(keyword? x)
|
||||
(sql-ident x)
|
||||
(symbol? x)
|
||||
(sql-kw x)
|
||||
(string? x)
|
||||
(sql-str x)
|
||||
(sequential? x)
|
||||
(sql-list "(" ")" ", " (map sql x))))
|
||||
items)))
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 514 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 507 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 435 KiB |
Loading…
Reference in New Issue