From bb30ca3a208e83b131521dcac01fe93f0ca2d726 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Sun, 25 May 2025 12:29:59 +0100 Subject: [PATCH] Bad where links in list views issue now fixed; pastoralist SQL is good. --- project.clj | 2 +- src/adl/to_psql.clj | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index d306ce5..f07537d 100644 --- a/project.clj +++ b/project.clj @@ -8,7 +8,7 @@ :dependencies [[adl-support "0.1.8-SNAPSHOT"] [bouncer "1.0.1"] [clojure-saxon "0.9.4"] - [environ "1.1.0"] + [environ "1.2.0"] [hiccup "1.0.5"] [org.clojure/clojure "1.12.0"] [org.clojure/math.combinatorics "0.3.0"] diff --git a/src/adl/to_psql.clj b/src/adl/to_psql.clj index 64d6826..ee8b504 100644 --- a/src/adl/to_psql.clj +++ b/src/adl/to_psql.clj @@ -369,15 +369,16 @@ (map (fn [f] (let - [farside (entity-for-property f application)] + [farside (entity-for-property f application) + fieldname (safe-name (field-name f) :sql)] (str - (safe-name entity :sql) - "." - (field-name f) - " = " - (safe-name farside :sql) - "." - (safe-name (first (key-names farside)) :sql)))) + (safe-name entity :sql) + "." + fieldname + " = " + fieldname + "." + (safe-name (first (key-names farside)) :sql)))) entity-properties)))) ";" (emit-permissions-grant view-name :SELECT (find-permissions entity application))))))))