Skip to content

Commit 97308a7

Browse files
myguidingstarmyguidingstar
committed
new join api
1 parent 02d3ea1 commit 97308a7

File tree

11 files changed

+258
-197
lines changed

11 files changed

+258
-197
lines changed

‎dev/resources/common_unpatched.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"INSERT INTO `article` (`id`, `title`, `current_revision`) VALUES (1, 'introduction', 2), (2, 'hello world', 1)" ]
6868
:down ["DROP TABLE `article`"]}
6969
[:duct.migrator.ragtime/sql :walkable-demo.migration.scenario-5/create-revision-table]
70-
{:up ["CREATE TABLE `revision` (`id` SERIAL, `content` TEXT, `revision` INTEGER)"
70+
{:up ["CREATE TABLE `revision` (`id` INTEGER, `content` TEXT, `revision` INTEGER)"
7171
"INSERT INTO `revision` (`id`, `content`, `revision`) VALUES (1, 'tbd', 1), (1, 'this is sparta', 2), (2, 'welcome to my site', 1)" ]
7272
:down ["DROP TABLE `revision`"]}
7373
}

‎dev/resources/config-mysql.edn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#ig/ref :walkable-demo.migration.scenario-3/create-person_pet-table
1414
#ig/ref :walkable-demo.migration.scenario-4/create-human-table
1515
#ig/ref :walkable-demo.migration.scenario-4/create-follow-table
16+
#ig/ref :walkable-demo.migration.scenario-5/create-article-table
17+
#ig/ref :walkable-demo.migration.scenario-5/create-revision-table
1618
;; mysql-specific scenarios (starting from 100)
1719
]}
1820
}

‎dev/resources/config-postgres.edn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#ig/ref :walkable-demo.migration.scenario-3/create-person_pet-table
2727
#ig/ref :walkable-demo.migration.scenario-4/create-human-table
2828
#ig/ref :walkable-demo.migration.scenario-4/create-follow-table
29+
#ig/ref :walkable-demo.migration.scenario-5/create-article-table
30+
#ig/ref :walkable-demo.migration.scenario-5/create-revision-table
2931
;; postgres-specific scenarios (starting from 100)
3032

3133
#ig/ref :walkable-demo.migration.scenario-100/create-land-animal-table

‎dev/resources/config-sqlite.edn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#ig/ref :walkable-demo.migration.scenario-3/create-person_pet-table
1414
#ig/ref :walkable-demo.migration.scenario-4/create-human-table
1515
#ig/ref :walkable-demo.migration.scenario-4/create-follow-table
16+
#ig/ref :walkable-demo.migration.scenario-5/create-article-table
17+
#ig/ref :walkable-demo.migration.scenario-5/create-revision-table
1618
;; sqlite-specific scenarios (starting from 100)
1719
]}
1820
}

‎dev/resources/core-mysql.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"INSERT INTO `article` (`id`, `title`, `current_revision`) VALUES (1, 'introduction', 2), (2, 'hello world', 1)" ]
6868
:down ["DROP TABLE `article`"]}
6969
[:duct.migrator.ragtime/sql :walkable-demo.migration.scenario-5/create-revision-table]
70-
{:up ["CREATE TABLE `revision` (`id` SERIAL, `content` TEXT, `revision` INTEGER)"
70+
{:up ["CREATE TABLE `revision` (`id` INTEGER, `content` TEXT, `revision` INTEGER)"
7171
"INSERT INTO `revision` (`id`, `content`, `revision`) VALUES (1, 'tbd', 1), (1, 'this is sparta', 2), (2, 'welcome to my site', 1)" ]
7272
:down ["DROP TABLE `revision`"]}
7373
}

‎dev/resources/core-postgres.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"INSERT INTO \"article\" (\"id\", \"title\", \"current_revision\") VALUES (1, 'introduction', 2), (2, 'hello world', 1)" ]
6868
:down ["DROP TABLE \"article\""]}
6969
[:duct.migrator.ragtime/sql :walkable-demo.migration.scenario-5/create-revision-table]
70-
{:up ["CREATE TABLE \"revision\" (\"id\" SERIAL, \"content\" TEXT, \"revision\" INTEGER)"
70+
{:up ["CREATE TABLE \"revision\" (\"id\" INTEGER, \"content\" TEXT, \"revision\" INTEGER)"
7171
"INSERT INTO \"revision\" (\"id\", \"content\", \"revision\") VALUES (1, 'tbd', 1), (1, 'this is sparta', 2), (2, 'welcome to my site', 1)" ]
7272
:down ["DROP TABLE \"revision\""]}
7373
}

‎dev/resources/core-sqlite.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"INSERT INTO `article` (`id`, `title`, `current_revision`) VALUES (1, 'introduction', 2), (2, 'hello world', 1)" ]
6868
:down ["DROP TABLE `article`"]}
6969
[:duct.migrator.ragtime/sql :walkable-demo.migration.scenario-5/create-revision-table]
70-
{:up ["CREATE TABLE `revision` (`id` SERIAL, `content` TEXT, `revision` INTEGER)"
70+
{:up ["CREATE TABLE `revision` (`id` INTEGER, `content` TEXT, `revision` INTEGER)"
7171
"INSERT INTO `revision` (`id`, `content`, `revision`) VALUES (1, 'tbd', 1), (1, 'this is sparta', 2), (2, 'welcome to my site', 1)" ]
7272
:down ["DROP TABLE `revision`"]}
7373
}

‎dev/test/walkable/integration_test/common.cljc‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
:output [:farmer/name :farmer/house-plus :farmer/house-count :farmer/house]}
1515
{:key :farmer/house
1616
:type :join
17-
:join-path [:farmer/house-index :house/index]
17+
:join-path [{:farmer/house-index :house/index}]
1818
:output [:house/color]
1919
:cardinality :one}
2020
{:key :house/owner
2121
:type :join
22-
:join-path [:house/index :farmer/house-index]
22+
:join-path [{:house/index :farmer/house-index}]
2323
:output [:farmer/number]
2424
:cardinality :one}])
2525

@@ -30,12 +30,12 @@
3030
:output [:kid/name]}
3131
{:key :toy/owner
3232
:type :join
33-
:join-path [:toy/owner-number :kid/number]
33+
:join-path [{:toy/owner-number :kid/number}]
3434
:output [:kid/name :kid/number]
3535
:cardinality :one}
3636
{:key :kid/toy
3737
:type :join
38-
:join-path [:kid/number :toy/owner-number]
38+
:join-path [{:kid/number :toy/owner-number}]
3939
:output [:toy/color :toy/index]
4040
:cardinality :one}
4141
{:key :kid/number
@@ -50,7 +50,8 @@
5050
:output [:human/number :human/name :human/yob :human/age]}
5151
{:key :human/follow
5252
:type :join
53-
:join-path [:human/number :follow/human-1 :follow/human-2 :human/number]
53+
:join-path [{:human/number :follow/human-1}
54+
{:follow/human-2 :human/number}]
5455
:output [:human/number :human/name :human/yob :human/age]}])
5556

5657
(def person-pet-registry
@@ -82,8 +83,8 @@
8283
{:key :person/pet
8384
:type :join
8485
:join-path
85-
[:person/number :person-pet/person-number
86-
:person-pet/pet-index :pet/index]
86+
[{:person/number :person-pet/person-number}
87+
{:person-pet/pet-index :pet/index}]
8788
:output [:pet/index
8889
:person-pet/adoption-year
8990
:pet/name
@@ -92,13 +93,14 @@
9293
{:key :pet/owner
9394
:type :join
9495
:join-path
95-
[:pet/index :person-pet/pet-index :person-pet/person-number :person/number]
96+
[{:pet/index :person-pet/pet-index}
97+
{:person-pet/person-number :person/number}]
9698
:output [:person/number]}
9799
{:key :person/pet-count
98100
:type :join
99101
:join-path
100-
[:person/number :person-pet/person-number
101-
:person-pet/pet-index :pet/index]
102+
[{:person/number :person-pet/person-number}
103+
{:person-pet/pet-index :pet/index}]
102104
:aggregate true
103105
:formula [:count-*]}
104106
{:key :pets/by-color
@@ -111,6 +113,18 @@
111113
:type :pseudo-column
112114
:formula [:count :pet/index]}])
113115

116+
(def article-revision-registry
117+
[{:key :articles/list
118+
:type :root
119+
:table "article"
120+
:output [:article/id :article/title :article/current-revision]}
121+
{:key :article/revision
122+
:type :join
123+
:cardinality :one
124+
:output [:revision/content]
125+
:join-path [{:article/id :revision/id
126+
:article/current-revision :revision/revision}]}])
127+
114128
(def common-scenarios
115129
{:farmer-house
116130
{:registry farmer-house-registry
@@ -161,7 +175,7 @@
161175
{:farmer/house [:house/index :house/color]}]}]
162176
:expected
163177
#:farmers{:farmers [#:farmer{:number 2, :house #:house {:index "20", :color "brown"}}]}}]}
164-
178+
165179
:kid-toy
166180
{:registry kid-toy-registry
167181
:test-suite
@@ -418,4 +432,21 @@
418432
:person/age]}]
419433
:expected
420434
#:people {:people [#:person{:number 1, :name "jon", :yob 1980, :age 38}
421-
#:person{:number 2, :name "mary", :yob 1992, :age 26}]}}]}})
435+
#:person{:number 2, :name "mary", :yob 1992, :age 26}]}}]}
436+
437+
:article-revision
438+
{:registry article-revision-registry
439+
:test-suite
440+
[{:message "join with multiple column pairs should work"
441+
:query `[{:articles/list [:article/id :article/title
442+
{:article/revision [:revision/content]}]}]
443+
:expected
444+
#:articles{:list
445+
[#:article{:id 1,
446+
:title "introduction",
447+
:revision
448+
#:revision{:content "this is sparta"}}
449+
#:article{:id 2,
450+
:title "hello world",
451+
:revision
452+
#:revision{:content "welcome to my site"}}]}}]}})

‎src/walkable/sql_query_builder/ast.cljc‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
[floor-plan {:keys [dispatch-key]}]
1111
(get-in floor-plan [:target-table dispatch-key]))
1212

13-
(defn target-column
13+
(defn target-columns
1414
[floor-plan {:keys [dispatch-key]}]
15-
(get-in floor-plan [:target-column dispatch-key]))
15+
(get-in floor-plan [:target-columns dispatch-key]))
1616

17-
(defn source-column
17+
(defn source-columns
1818
[floor-plan {:keys [dispatch-key]}]
19-
(get-in floor-plan [:source-column dispatch-key]))
19+
(get-in floor-plan [:source-columns dispatch-key]))
2020

2121
(defn result-key [ast]
2222
(let [k (:pathom/as (:params ast))]
@@ -138,17 +138,17 @@
138138

139139
(defn process-children*
140140
"Infers which columns to include in SQL query from child keys in ast"
141-
[floor-plan ast]
141+
[floor-plan ast]
142142
(let [all-children (:children ast)
143-
143+
144144
{:keys [columns joins]}
145145
(group-by #(keyword-type floor-plan %) all-children)
146146

147147
child-column-keys
148148
(into #{} (map :dispatch-key) columns)
149149

150150
child-source-columns
151-
(into #{} (map #(source-column floor-plan %)) joins)]
151+
(into #{} (mapcat #(source-columns floor-plan %)) joins)]
152152
{:columns-to-query (set/union child-column-keys child-source-columns)}))
153153

154154
(defn process-children
@@ -184,16 +184,16 @@
184184
(defn individual-query-template
185185
[{:keys [floor-plan ast pagination]}]
186186
(let [ident? (vector? (:key ast))
187-
187+
188188
{:keys [:columns-to-query]} (process-children floor-plan ast)
189-
target-column (target-column floor-plan ast)
189+
190+
target-columns (target-columns floor-plan ast)
190191

191192
{:keys [:offset :limit :order-by :order-by-columns]}
192193
(when-not ident? pagination)
193194

194195
columns-to-query
195-
(-> (clojure.set/union columns-to-query order-by-columns)
196-
(conj-some target-column))
196+
(clojure.set/union columns-to-query order-by-columns (set target-columns))
197197

198198
selection
199199
(process-selection floor-plan columns-to-query)
@@ -204,17 +204,17 @@
204204

205205
sql-query {:raw-string
206206
(emitter/->query-string
207-
{:target-table (target-table floor-plan ast)
208-
:join-statement (join-statement floor-plan ast)
209-
:selection (:raw-string selection)
210-
:conditions (:raw-string conditions)
211-
;; TODO:
212-
;; use :raw-string/:params here in case there are variables in group-by columns
213-
:group-by (compiled-group-by floor-plan ast)
214-
:having (:raw-string having)
215-
:offset offset
216-
:limit limit
217-
:order-by order-by})
207+
{:target-table (target-table floor-plan ast)
208+
:join-statement (join-statement floor-plan ast)
209+
:selection (:raw-string selection)
210+
:conditions (:raw-string conditions)
211+
;; TODO:
212+
;; use :raw-string/:params here in case there are variables in group-by columns
213+
:group-by (compiled-group-by floor-plan ast)
214+
:having (:raw-string having)
215+
:offset offset
216+
:limit limit
217+
:order-by order-by})
218218
:params (expressions/combine-params selection conditions having)}]
219219
sql-query))
220220

@@ -223,12 +223,7 @@
223223
[shared-query batched-individuals]))
224224

225225
#_(defn combine-without-cte [{:keys [batched-individuals]}]
226-
batched-individuals)
227-
228-
(defn source-column-variable-values
229-
[v]
230-
{:variable-values {`floor-plan/source-column-value
231-
(expressions/compile-to-string {} v)}})
226+
batched-individuals)
232227

233228
(defn compute-graphs [floor-plan env variables]
234229
(let [variable->graph-index (variable->graph-index floor-plan)
@@ -327,8 +322,8 @@
327322
(let [q (batched-individuals env entities)]
328323
(when (not-empty (:raw-string q))
329324
(->> q
330-
(process-query floor-plan env)
331-
eliminate-unknown-variables))))))
325+
(process-query floor-plan env)
326+
eliminate-unknown-variables))))))
332327

333328
(defn prepare-query
334329
[floor-plan ast]

0 commit comments

Comments
 (0)