simon/adl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

#10: fixes bug 10, all tests pass, no regression expected.

Browse source
This commit is contained in:
Simon Brooke 2019-12-28 14:20:50 +00:00
parent b472bd4950
commit 69ead0f5eb
2 changed files with 56 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/adl/to_psql.clj
View file

@ -320,7 +320,8 @@
(let [view-name (safe-name (str "lv_" (:table (:attrs entity))) :sql) (let [view-name (safe-name (str "lv_" (:table (:attrs entity))) :sql)
entity-properties (filter entity-properties (filter
#(= (:type (:attrs %)) "entity") #(= (:type (:attrs %)) "entity")
(properties entity))] (properties entity))
tn (safe-name (-> entity :attrs :table) :sql)]
(s/join (s/join
"\n" "\n"
(remove (remove
@ -345,8 +346,8 @@
(= (:type (:attrs %)) "entity") (= (:type (:attrs %)) "entity")
(list (list
(emit-convenience-entity-field % entity application (field-name %)) (emit-convenience-entity-field % entity application (field-name %))
(str (safe-name entity) "." (field-name %))) (str tn "." (field-name %)))
(str (safe-name entity) "." (field-name %))) (str tn "." (field-name %)))
(remove (remove
#(#{"link" "list"} (:type (:attrs %))) #(#{"link" "list"} (:type (:attrs %)))
(all-properties entity) )))))) (all-properties entity) ))))))

54
test/adl/to_psql_test.clj
View file

@ -493,6 +493,56 @@
should-not-find #"animal.name AS dam_expanded"] should-not-find #"animal.name AS dam_expanded"]
;; (print actual) ;; see what we've got ;; (print actual) ;; see what we've got
(is (re-find should-find actual)) (is (re-find should-find actual))
(is (nil? (re-find should-not-find actual)))) (is (nil? (re-find should-not-find actual)))))))
))) (deftest bug-10-test
(testing "Correct table names in convenience view select queries
see [bug 10](https://github.com/simon-brooke/adl/issues/10)"
(let [app
{:tag :application,
:attrs {:version "0.0.1",
:name "pastoralist",
:xmlns:adl "http://bowyer.journeyman.cc/adl/1.4.1/",
:xmlns:html "http://www.w3.org/1999/xhtml",
:xmlns "http://bowyer.journeyman.cc/adl/1.4.1/"},
:content [{:tag :documentation,
:attrs nil,
:content ["A web-app intended to be used by pastoralists in managing
pastures, grazing, and animals."]}
{:tag :entity,
:attrs
{:volatility "5",
:magnitude "3",
:name "event-type",
:table "event-type"},
:content
[{:tag :key,
:attrs nil,
:content
[{:tag :property,
:attrs
{:distinct "system",
:immutable "true",
:column "id",
:name "id",
:type "integer",
:required "true"},
:content
[{:tag :generator, :attrs {:action "native"}, :content nil}]}]}
{:tag :property,
:attrs {:size "80", :type "string", :name "summary"},
:content nil}
{:tag :property,
:attrs {:type "text", :name "description"},
:content nil}
{:tag :property,
:attrs {:default "1", :type "integer", :name "n-holdings"},}
{:tag :property,
:attrs {:default "1", :type "integer", :name "n-pastures"}}
{:tag :property,
:attrs {:default "1", :type "integer", :name "n-animals"}}]}]}
should-find #"event_type.description"
should-not-find #"event-type.description"
actual (emit-convenience-view (child app #(= (-> % :attrs :name) "event-type")) app)]
(is (re-find should-find actual))
(is (nil? (re-find should-not-find actual))))))