From 16adc0d70796aa5ef6c277ce6c1e2505348d0c74 Mon Sep 17 00:00:00 2001 From: Tamizhvendan S Date: Thu, 31 Oct 2024 21:43:03 +0530 Subject: [PATCH] fixes #15 --- CHANGELOG.md | 5 +++-- pom.xml | 4 ++-- src/honeyeql/mutation.clj | 15 +++++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 763c8f4..e1665e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +* 1.0.4 - 2024-10-31 + - Fixes #15 * 1.0.3 - 2024-07-26 - Updated docs * 1.0.2 - 2024-01-02 @@ -8,5 +10,4 @@ - Removed unused functions - Bumped dependencies to their latest versions * 1.0.1 -- 2023-11-21 - - Adding type hints for metadata generation. Credits [ -Dekel Pilli](https://github.com/tamizhvendan/honeyeql/pull/10) \ No newline at end of file + - Adding type hints for metadata generation. Credits [Dekel Pilli](https://github.com/tamizhvendan/honeyeql/pull/10) \ No newline at end of file diff --git a/pom.xml b/pom.xml index d55e285..4e49862 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.tamizhvendan honeyeql - 1.0.3 + 1.0.4 Honey EQL HoneyEQL enables you to query database using the EQL. @@ -21,7 +21,7 @@ https://github.com/tamizhvendan/honeyeql scm:git:git://github.com/tamizhvendan/honeyeql.git scm:git:ssh://git@github.com/tamizhvendan/honeyeql.git - 1.0.3 + 1.0.4 diff --git a/src/honeyeql/mutation.clj b/src/honeyeql/mutation.clj index 033f16e..a6e12f3 100644 --- a/src/honeyeql/mutation.clj +++ b/src/honeyeql/mutation.clj @@ -8,8 +8,11 @@ (defn- entity-name [entity] (-> entity keys first namespace)) -(defn- table-name [entity] - (-> (entity-name entity) (str/replace #"-" "_") keyword)) +(defn- table-name [{:keys [heql-meta-data]} entity] + (->> entity + keys + first + (heql-md/entity-relation-ident heql-meta-data))) (defn- sqlize-entity [db-adapter entity] (into {} @@ -25,7 +28,7 @@ (namespacify-attributes (entity-name entity) (sql/insert! (:db-spec db-adapter) - (table-name entity) + (table-name db-adapter entity) (sqlize-entity db-adapter entity) {:column-fn (db/table-fn db-adapter) :table-fn (db/table-fn db-adapter) @@ -40,7 +43,7 @@ (map #(namespacify-attributes first-entity-name %) (sql/insert-multi! (:db-spec db-adapter) - (table-name first-entity) + (table-name db-adapter first-entity) (keys (first sqlized-entities)) (map vals sqlized-entities) {:column-fn (db/table-fn db-adapter) @@ -48,13 +51,13 @@ :builder-fn rs/as-kebab-maps}))))) (defn update! [db-adapter update-params where-params] - (sql/update! (:db-spec db-adapter) (table-name update-params) + (sql/update! (:db-spec db-adapter) (table-name db-adapter update-params) (sqlize-entity db-adapter update-params) (sqlize-entity db-adapter where-params) {:column-fn (db/table-fn db-adapter) :table-fn (db/table-fn db-adapter)})) (defn delete! [db-adapter where-params] - (sql/delete! (:db-spec db-adapter) (table-name where-params) + (sql/delete! (:db-spec db-adapter) (table-name db-adapter where-params) (sqlize-entity db-adapter where-params) {:column-fn (db/table-fn db-adapter) :table-fn (db/table-fn db-adapter)})) \ No newline at end of file