WIP2

Author: rgm

modules/fstore-postgres/src/hyak2/postgres_store.clj

@@ -34,12 +34,14 @@
 (defn- feature-row->feature
   "Flatten an {:fkey :metadata} row into a flat map with expires-at parsed.
 
-   When `serialize?` is true, decodes JSON manually (instead of setting up
-   auto-convert via next.jdbc) so we don't mess with library consumers. When
-   false, assumes the auto-convert is in effect."
-  [serialize? feature-row]
-  (let [raw-meta (.getValue (:metadata feature-row))
-        metadata (if serialize?
+   Just decodes JSON manually (instead of setting up auto-convert via
+   next.jdbc) so we don't mess with library consumers. "
+  [feature-row]
+  ;; need to re-eval this, base might have futzed w the connection to de-jsonify
+  (let [raw-meta (if (map? (:metadata feature-row))
+                   (:metadata feature-row)
+                   (.getValue (:metadata feature-row)))
+        metadata (if (string? raw-meta)
                    (json/read-str raw-meta :key-fn keyword)
                    raw-meta)
         ?expires-at (:expires-at metadata)]
@@ -177,19 +179,16 @@
   [f ttl-threshold-msec]
   (if ttl-threshold-msec (memo/ttl f :ttl/threshold ttl-threshold-msec) f))
 
-(defrecord FeatureStore
-           [table-prefix datasource enabled-pred serialize? *group-registry]
+(defrecord FeatureStore [table-prefix datasource enabled-pred *group-registry]
   ha/IFStore
   (-features [_]
     (let [params (make-names table-prefix)]
-      (map (partial feature-row->feature serialize?)
-           (hug:select-features datasource params))))
+      (map feature-row->feature (hug:select-features datasource params))))
 
   (-add! [_ fkey expires-at author]
     (let [row {:fkey     fkey
-               :metadata (cond-> {:expires-at (ldt->string expires-at)
-                                  :author author}
-                           serialize? json/write-str)}
+               :metadata (json/write-str {:expires-at (ldt->string expires-at)
+                                          :author author})}
           params (merge (make-names table-prefix) row)]
       (hug:upsert-feature datasource params)))
 
@@ -199,8 +198,7 @@
 
   (-expired? [_ fkey now]
     (let [params  (merge (make-names table-prefix) {:fkey fkey})
-          feature (some-> (hug:select-feature datasource params)
-                          (partial feature-row->feature serialize?))]
+          feature (some-> (hug:select-feature datasource params) feature-row->feature)]
       (hp/before? (:expires-at feature) now)))
 
   (-disable! [_ fkey]
@@ -293,10 +291,6 @@
    Supply opts `{:clear-tables? true}` to reuse existing tables but clear
    existing table data.
 
-   Supply opts `{:disable-serialization? true}` to opt out of JSON
-   serialization if the jdbc protocols have been extended to handle it
-   automatically, eg. as outlined in https://cljdoc.org/d/seancorfield/next.jdbc/1.2.659/doc/getting-started/tips-tricks#working-with-json-and-jsonb
-
    Supply opts `{:ttl/threshold msec}` to memoize the `enabled?` call to
    reduce db load, at the cost of the TTL's delay in a feature's activation."
   ([table-prefix jdbc-database-url]
@@ -310,7 +304,6 @@
    (->FeatureStore table-prefix
                    jdbc-database-url
                    (memoize-fn enabled? (:ttl/threshold opts))
-                   (boolean (not (:disable-serialization? opts)))
                    (atom {}))))
 
 (defn destroy-fstore! [{:keys [table-prefix datasource] :as _fstore}]