Merge branch 'bugfix/invalid-timestamp-floor-year-unit' of github.com:peterklingelhofer/cube into peterklingelhofer-bugfix/invalid-timestamp-floor-year-unit

Author: KSDaemon

packages/cubejs-api-gateway/test/graphql-queries/base-snake-case.gql

@@ -73,7 +73,9 @@ query CubeQuery {
 }
 
 query CubeQuery {
-  cube(where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }) {
+  cube(
+    where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }
+  ) {
     orders {
       count
       created_at {
@@ -130,3 +132,14 @@ query CubeQuery {
     }
   }
 }
+
+query CubeQuery {
+  cube(where: { orders: { created_at: { inDateRange: "This year" } } }) {
+    orders(orderBy: { created_at: asc }) {
+      count
+      created_at {
+        year
+      }
+    }
+  }
+}

packages/cubejs-api-gateway/test/graphql-queries/base.gql

@@ -73,7 +73,9 @@ query CubeQuery {
 }
 
 query CubeQuery {
-  cube(where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }) {
+  cube(
+    where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }
+  ) {
     orders {
       count
       createdAt {
@@ -130,3 +132,14 @@ query CubeQuery {
     }
   }
 }
+
+query CubeQuery {
+  cube(where: { orders: { createdAt: { inDateRange: "This year" } } }) {
+    orders(orderBy: { createdAt: asc }) {
+      count
+      createdAt {
+        year
+      }
+    }
+  }
+}

packages/cubejs-questdb-driver/src/QuestQuery.ts

@@ -6,7 +6,7 @@ const GRANULARITY_TO_INTERVAL: Record<string, string> = {
   hour: 'h',
   day: 'd',
   month: 'M',
-  year: 'Y'
+  year: 'y'
 };
 
 class QuestParamAllocator extends ParamAllocator {