Merge pull request #1798 from rudderlabs/hotfix-release/v1.97.3

chore(release): pull hotfix-release/v1.97.3 into main
rudderlabs · Nov 14, 2024 · 3bb60cc · 3bb60cc
2 parents f9cca3b + b873046
commit 3bb60cc
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.97.3](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.2...v1.97.3) (2024-11-14)
+
+
+### Bug Fixes
+
+* bq partitioning for additional columns ([#1797](https://github.com/rudderlabs/rudder-config-schema/issues/1797)) ([498f0b0](https://github.com/rudderlabs/rudder-config-schema/commit/498f0b0afa11ef8e18902950de00f01651e440c4))
+
 ### [1.97.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.1...v1.97.2) (2024-11-07)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-config-schema",
-  "version": "1.97.2",
+  "version": "1.97.3",
   "description": "",
   "main": "src/index.ts",
   "private": true,

diff --git a/src/configurations/destinations/bq/schema.json b/src/configurations/destinations/bq/schema.json
@@ -35,7 +35,7 @@
       },
       "partitionColumn": {
         "type": "string",
-        "pattern": "^(_PARTITIONTIME|loaded_at|received_at)$",
+        "pattern": "^(_PARTITIONTIME|loaded_at|received_at|timestamp|sent_at|original_timestamp)$",
         "default": "_PARTITIONTIME"
       },
       "partitionType": {

diff --git a/src/configurations/destinations/bq/ui-config.json b/src/configurations/destinations/bq/ui-config.json
@@ -160,6 +160,18 @@
             {
               "name": "Received At",
               "value": "received_at"
+            },
+            {
+              "name": "Timestamp",
+              "value": "timestamp"
+            },
+            {
+              "name": "Sent At",
+              "value": "sent_at"
+            },
+            {
+              "name": "Original Timestamp",
+              "value": "original_timestamp"
             }
           ],
           "defaultOption": {

diff --git a/test/data/validation/destinations/bq.json b/test/data/validation/destinations/bq.json
@@ -45,6 +45,54 @@
     },
     "result": true
   },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "sent_at",
+      "partitionType": "hour",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "timestamp",
+      "partitionType": "hour",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": true
+  },
+  {
+    "config": {
+      "project": "test-gcs-project",
+      "location": "",
+      "bucketName": "test-bucket",
+      "prefix": "xyzxx",
+      "namespace": "eu_new3",
+      "partitionColumn": "original_timestamp",
+      "partitionType": "hour",
+      "credentials": "{}",
+      "syncFrequency": "30",
+      "testConnection": false,
+      "testConnectionTS": 1621402528550
+    },
+    "result": true
+  },
   {
     "config": {
       "project": "test-gcs-project",
@@ -61,7 +109,7 @@
     },
     "result": false,
     "error": [
-      "partitionColumn must match pattern \"^(_PARTITIONTIME|loaded_at|received_at|timestamp)$\""
+      "partitionColumn must match pattern \"^(_PARTITIONTIME|loaded_at|received_at|timestamp|sent_at|original_timestamp)$\""
     ]
   },
   {