Merge pull request #1183 from Accenture/dependabot/npm_and_yarn/devel…

…op/prettier-plugin-sql-0.18.0 Bump prettier-plugin-sql from 0.15.1 to 0.18.0
Accenture · Jan 23, 2024 · f309eff · f309eff
2 parents 4d4758b + 3d0c62b
commit f309eff
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 25 deletions.
diff --git a/boilerplate/files/.prettierrc b/boilerplate/files/.prettierrc
@@ -17,6 +17,9 @@
             "options": {
                 "formatter": "sql-formatter",
                 "language": "tsql",
+                "identifierCase": "preserve",
+                "dataTypeCase": "preserve",
+                "functionCase": "upper",
                 "keywordCase": "upper"
             }
         }

diff --git a/boilerplate/forcedUpdates.json b/boilerplate/forcedUpdates.json
@@ -1,4 +1,8 @@
 [
+    {
+        "version": "6.0.3",
+        "files": [".prettierrc"]
+    },
     {
         "version": "5.0.0",
         "files": [".vscode/settings.json", ".prettierrc"]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
         "mustache": "4.2.0",
         "p-limit": "4.0.0",
         "prettier": "3.2.4",
-        "prettier-plugin-sql": "0.15.1",
+        "prettier-plugin-sql": "0.18.0",
         "semver": "7.5.4",
         "sfmc-sdk": "2.0.1",
         "simple-git": "3.22.0",

diff --git a/...rces/9999999/automation/v1/queries/549f0568-607c-4940-afef-437965094dat/get-response.json b/...rces/9999999/automation/v1/queries/549f0568-607c-4940-afef-437965094dat/get-response.json
@@ -3,7 +3,7 @@
     "name": "testExisting_query",
     "key": "testExisting_query",
     "description": "bla bla",
-    "queryText": "SELECT\n    SubscriberKey as testField\nFROM\n    _Subscribers\nWHERE\n    country IN ('test')\n",
+    "queryText": "Select\n    SubscriberKey as testField, Trim(last_name) AS name\nFrom\n    _Subscribers\nwhere\n    country in ('test')\n",
     "targetName": "testExisting_dataExtension",
     "targetKey": "testExisting_dataExtension",
     "targetId": "21711373-72c1-ec11-b83b-48df37d1deb7",

diff --git a/test/resources/9999999/automation/v1/queries/get-response.json b/test/resources/9999999/automation/v1/queries/get-response.json
@@ -8,7 +8,7 @@
             "name": "testExisting_query",
             "key": "testExisting_query",
             "description": "bla bla",
-            "queryText": "SELECT\n    SubscriberKey as testField\nFROM\n    _Subscribers\nWHERE\n    country IN ('test')\n",
+            "queryText": "Select\n    SubscriberKey as testField, Trim(last_name) AS name\nFrom\n    _Subscribers\nwhere\n    country in ('test')\n",
             "targetName": "testExisting_dataExtension",
             "targetKey": "testExisting_dataExtension",
             "targetId": "21711373-72c1-ec11-b83b-48df37d1deb7",
@@ -25,7 +25,7 @@
             "name": "testExisting_query2",
             "key": "testExisting_query2",
             "description": "bla bla",
-            "queryText": "SELECT\n    SubscriberKey as testField\nFROM\n    _Subscribers\nWHERE\n    country IN ('test')\n",
+            "queryText": "Select\n    SubscriberKey as testField, Trim(last_name) AS name\nfrom\n    _Subscribers\nwhere\n    country in ('test')\n",
             "targetName": "testExisting_dataExtension",
             "targetKey": "testExisting_dataExtension-WRONG",
             "targetId": "21711373-72c1-ec11-b83b-48df37d1deb7",
@@ -42,7 +42,7 @@
             "name": "testExisting_query_fixedKeys",
             "key": "testExisting_query_fixKeys",
             "description": "bla bla",
-            "queryText": "SELECT\n    SubscriberKey as testField\nFROM\n    _Subscribers\nWHERE\n    country IN ('test')\n",
+            "queryText": "Select\n    SubscriberKey as testField, Trim(last_name) AS name\nfrom\n    _Subscribers\nwhere\n    country in ('test')\n",
             "targetName": "testExisting_dataExtension",
             "targetKey": "testExisting_dataExtension",
             "targetId": "21711373-72c1-ec11-b83b-48df37d1deb7",

diff --git a/test/resources/9999999/query/build-expected.sql b/test/resources/9999999/query/build-expected.sql
@@ -1,5 +1,6 @@
 SELECT
-    SubscriberKey AS testField
+    SubscriberKey AS testField,
+    TRIM(last_name) AS name
 FROM
     _Subscribers
 WHERE

diff --git a/test/resources/9999999/query/get-expected.sql b/test/resources/9999999/query/get-expected.sql
@@ -1,5 +1,6 @@
 SELECT
-    SubscriberKey AS testField
+    SubscriberKey AS testField,
+    TRIM(last_name) AS name
 FROM
     _Subscribers
 WHERE

diff --git a/test/resources/9999999/query/template-expected.sql b/test/resources/9999999/query/template-expected.sql
@@ -1,5 +1,6 @@
 SELECT
-    SubscriberKey AS testField
+    SubscriberKey AS testField,
+    TRIM(last_name) AS name
 FROM
     _Subscribers
 WHERE

diff --git a/test/utils.js b/test/utils.js
@@ -168,6 +168,7 @@ export function mockSetup(isDeploy) {
         'node_modules/sql-formatter': fsmock.load(
             path.resolve(__dirname, '../node_modules/sql-formatter')
         ),
+        'node_modules/jsox': fsmock.load(path.resolve(__dirname, '../node_modules/jsox')),
         'node_modules/nearley': fsmock.load(path.resolve(__dirname, '../node_modules/nearley')),
     };
     if (isDeploy) {