luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #280 by changing the regex used for fk resolution

Browse source 
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2024-05-17 18:07:07 -07:00
parent 9e914bc5e1
commit c77f7539c6
No known key found for this signature in database
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
Only accretive/fixative changes will be made from now on. Only accretive/fixative changes will be made from now on.
* 1.3.next in progress * 1.3.next in progress
* Fix [#280](https://github.com/seancorfield/next-jdbc/issues/280) by allowing `-` as well as `_` in `nav` foreign key names.
* Update dev dependencies, including testing against Clojure 1.12 Alpha 11. * Update dev dependencies, including testing against Clojure 1.12 Alpha 11.
* 1.3.925 -- 2024-03-15 * 1.3.925 -- 2024-03-15

11
src/next/jdbc/result_set.clj
View file

@ -1037,7 +1037,7 @@
(let [fk-suffix (get-in opts [:schema-opts :fk-suffix] "id") (let [fk-suffix (get-in opts [:schema-opts :fk-suffix] "id")
pk (get-in opts [:schema-opts :pk] "id") pk (get-in opts [:schema-opts :pk] "id")
pk-fn (get-in opts [:schema-opts :pk-fn] (constantly (name pk))) pk-fn (get-in opts [:schema-opts :pk-fn] (constantly (name pk)))
[_ table] (re-find (re-pattern (str "(?i)^(.+?)_?" [_ table] (re-find (re-pattern (str "(?i)^(.+?)[-_]?"
(name fk-suffix) (name fk-suffix)
"$")) "$"))
(name col))] (name col))]
@ -1050,8 +1050,10 @@
(default-schema {} :user_statusid) (default-schema {} :user_statusid)
(default-schema {:schema-opts {:fk-suffix "did"}} :user_id) (default-schema {:schema-opts {:fk-suffix "did"}} :user_id)
(default-schema {:schema-opts {:fk-suffix "did"}} :user_did) (default-schema {:schema-opts {:fk-suffix "did"}} :user_did)
(default-schema {:schema-opts {:fk-suffix "did"}} :user-did)
(default-schema {:schema-opts {:fk-suffix "(did|id)"}} :user_id) (default-schema {:schema-opts {:fk-suffix "(did|id)"}} :user_id)
(default-schema {:schema-opts {:fk-suffix "(did|id)"}} :user_did) (default-schema {:schema-opts {:fk-suffix "(did|id)"}} :user_did)
(default-schema {:schema-opts {:fk-suffix "(did|id)"}} :user-did)
(default-schema {:schema-opts {:fk-suffix "(did|id)" (default-schema {:schema-opts {:fk-suffix "(did|id)"
:pk :did}} :user_did) :pk :did}} :user_did)
(default-schema {:schema-opts {:fk-suffix "(did|id)" (default-schema {:schema-opts {:fk-suffix "(did|id)"
@ -1061,6 +1063,13 @@
"id" "id"
pk))}} pk))}}
:user_did) :user_did)
(default-schema {:schema-opts {:fk-suffix "(did|id)"
:pk :did
:pk-fn (fn [table pk]
(if (= "user" table)
"id"
pk))}}
:user-did)
(default-schema {:schema-opts {:fk-suffix "(did|id)" (default-schema {:schema-opts {:fk-suffix "(did|id)"
:pk :did :pk :did
:pk-fn (fn [table pk] :pk-fn (fn [table pk]