From c905853366da9bc9f69303f1617cdd4035d2d643 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Thu, 2 Mar 2023 09:56:30 -0800 Subject: [PATCH] address #471 by switching prefix to :! --- src/honey/sql.cljc | 2 +- test/honey/sql_test.cljc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/honey/sql.cljc b/src/honey/sql.cljc index 3321fcd..e21813e 100644 --- a/src/honey/sql.cljc +++ b/src/honey/sql.cljc @@ -470,7 +470,7 @@ [expr] (and (ident? expr) (nil? (namespace expr)) - (re-find #"^\*[a-zA-Z]" (name expr)))) + (re-find #"^![a-zA-Z]" (name expr)))) (defn format-interspersed-expr-list "If there are inline (SQL) keywords, use them to join the formatted diff --git a/test/honey/sql_test.cljc b/test/honey/sql_test.cljc index 4690fcf..96b7b61 100644 --- a/test/honey/sql_test.cljc +++ b/test/honey/sql_test.cljc @@ -1113,23 +1113,23 @@ ORDER BY id = ? DESC (testing "overlay" (is (= ["SELECT OVERLAY(foo PLACING ? FROM ? FOR ?)" "bar" 3 4] - (sut/format {:select [[[:overlay :foo :*placing "bar" :*from 3 :*for 4]]]})))) + (sut/format {:select [[[:overlay :foo :!placing "bar" :!from 3 :!for 4]]]})))) (testing "position" (is (= ["SELECT POSITION(? IN bar)" "foo"] - (sut/format {:select [[[:position "foo" :*in :bar]]]})))) + (sut/format {:select [[[:position "foo" :!in :bar]]]})))) (testing "trim" (is (= ["SELECT TRIM(LEADING FROM bar)"] - (sut/format {:select [[[:trim :*leading :*from :bar]]]}))) + (sut/format {:select [[[:trim :!leading :!from :bar]]]}))) (is (= ["SELECT TRIM(LEADING FROM bar)"] - (sut/format {:select [[[:trim :*leading-from :bar]]]})))) + (sut/format {:select [[[:trim :!leading-from :bar]]]})))) (testing "extract" (is (= ["SELECT EXTRACT(CENTURY FROM TIMESTAMP '2000-12-16 12:21:13')"] - (sut/format {:select [[[:extract :*century :*from - :*timestamp [:inline "2000-12-16 12:21:13"]]]]})))) + (sut/format {:select [[[:extract :!century :!from + :!timestamp [:inline "2000-12-16 12:21:13"]]]]})))) (testing "xmlelement" (is (= ["SELECT XMLELEMENT(NAME \"foo$bar\", XMLATTRIBUTES('xyz' AS \"a&b\"))"] - (sut/format {:select [[[:xmlelement :*name :foo$bar - [:xmlattributes [:inline "xyz"] :*as :a&b]]]]}))))) + (sut/format {:select [[[:xmlelement :!name :foo$bar + [:xmlattributes [:inline "xyz"] :!as :a&b]]]]}))))) (deftest issue-474-dot-selection (testing "basic dot selection"