Merge "[email protected]: support trailing semicolon in GaarfSQL" into main

google · Feb 28, 2024 · 99120e8 · 99120e8
2 parents b9b0932 + a1bb21b
commit 99120e8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/js/dist/lib/ads-query-editor.js b/js/dist/lib/ads-query-editor.js
diff --git a/js/dist/lib/ads-query-editor.js.map b/js/dist/lib/ads-query-editor.js.map
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-ads-api-report-fetcher",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Google Ads API Report Fetcher (gaarf)",
   "main": "./dist/index.js",
   "types": "./src/index.ts",

diff --git a/js/src/lib/ads-query-editor.ts b/js/src/lib/ads-query-editor.ts
@@ -60,7 +60,9 @@ export class AdsQueryEditor {
     query = query.replaceAll(/\/\*([\s\S]*?)\*\//g, "");
     // remove non-single whitespaces
     query = "" + query.replace(/\s{2,}/g, " ");
-    return query.trim();
+    // remove trailing semicolon
+    query = query.trim().replace(/;$/gm, '')
+    return query;
   }
 
   private parseFunctions(query: string): Record<string, Function> {