drizzle-databend 0.1.11 → 0.1.13

package/src/sql/result-mapper.ts

@@ -7,14 +7,9 @@ import {
   type SelectedFieldsOrdered,
   SQL,
 } from 'drizzle-orm';
-import {
-  PgCustomColumn,
-  PgDate,
-  PgDateString,
-  PgTime,
-  PgTimestamp,
-  PgTimestampString,
-} from 'drizzle-orm/pg-core';
+import { DatabendCustomColumn } from '../databend-core/columns/custom.ts';
+import { DatabendDate } from '../databend-core/columns/date.ts';
+import { DatabendTimestamp } from '../databend-core/columns/timestamp.ts';
 
 type SQLInternal<T = unknown> = SQL<T> & {
   decoder: DriverValueDecoder<T, any>;
@@ -33,25 +28,21 @@ function toDecoderInput<TDecoder extends DriverValueDecoder<unknown, unknown>>(
 
 export function normalizeTimestampString(
   value: unknown,
-  withTimezone: boolean
+  _withTimezone: boolean
 ): string | unknown {
   if (value instanceof Date) {
     const iso = value.toISOString().replace('T', ' ');
-    return withTimezone ? iso.replace('Z', '+00') : iso.replace('Z', '');
+    return iso.replace('Z', '');
   }
   if (typeof value === 'string') {
-    const normalized = value.replace('T', ' ');
-    if (withTimezone) {
-      return normalized.includes('+') ? normalized : `${normalized}+00`;
-    }
-    return normalized.replace(/\+00$/, '');
+    return value.replace('T', ' ');
   }
   return value;
 }
 
 export function normalizeTimestamp(
   value: unknown,
-  withTimezone: boolean
+  _withTimezone: boolean
 ): Date | unknown {
   if (value instanceof Date) {
     return value;
@@ -60,7 +51,7 @@ export function normalizeTimestamp(
     const hasOffset =
       value.endsWith('Z') || /[+-]\d{2}:?\d{2}$/.test(value.trim());
     const spaced = value.replace(' ', 'T');
-    const normalized = withTimezone || hasOffset ? spaced : `${spaced}+00`;
+    const normalized = hasOffset ? spaced : `${spaced}Z`;
     return new Date(normalized);
   }
   return value;
@@ -86,57 +77,24 @@ export function normalizeDateValue(value: unknown): Date | unknown {
   return value;
 }
 
-export function normalizeTime(value: unknown): string | unknown {
-  if (typeof value === 'bigint') {
-    const totalMillis = Number(value) / 1000;
-    const date = new Date(totalMillis);
-    return date.toISOString().split('T')[1]!.replace('Z', '');
-  }
-  if (value instanceof Date) {
-    return value.toISOString().split('T')[1]!.replace('Z', '');
-  }
-  return value;
-}
-
 function mapDriverValue(
   decoder: DriverValueDecoder<unknown, unknown>,
   rawValue: unknown
 ): unknown {
-  if (is(decoder, PgTimestampString)) {
-    return decoder.mapFromDriverValue(
-      toDecoderInput(
-        decoder,
-        normalizeTimestampString(rawValue, decoder.withTimezone)
-      )
-    );
-  }
-
-  if (is(decoder, PgTimestamp)) {
-    const normalized = normalizeTimestamp(rawValue, decoder.withTimezone);
+  if (is(decoder, DatabendTimestamp)) {
+    const normalized = normalizeTimestamp(rawValue, false);
     if (normalized instanceof Date) {
       return normalized;
     }
     return decoder.mapFromDriverValue(toDecoderInput(decoder, normalized));
   }
 
-  if (is(decoder, PgDateString)) {
+  if (is(decoder, DatabendDate)) {
     return decoder.mapFromDriverValue(
       toDecoderInput(decoder, normalizeDateString(rawValue))
     );
   }
 
-  if (is(decoder, PgDate)) {
-    return decoder.mapFromDriverValue(
-      toDecoderInput(decoder, normalizeDateValue(rawValue))
-    );
-  }
-
-  if (is(decoder, PgTime)) {
-    return decoder.mapFromDriverValue(
-      toDecoderInput(decoder, normalizeTime(rawValue))
-    );
-  }
-
   return decoder.mapFromDriverValue(toDecoderInput(decoder, rawValue));
 }
 
@@ -157,7 +115,7 @@ export function mapResultRow<TResult>(
       } else {
         const col = field.sql.queryChunks.find((chunk) => is(chunk, Column));
 
-        if (is(col, PgCustomColumn)) {
+        if (is(col, DatabendCustomColumn)) {
           decoder = col;
         } else {
           decoder = (field.sql as SQLInternal).decoder;

package/src/sql/selection.ts

@@ -1,5 +1,6 @@
 import { Column, getTableName, is, SQL, sql } from 'drizzle-orm';
-import type { SelectedFields } from 'drizzle-orm/pg-core';
+
+type SelectedFields = Record<string, any>;
 
 function mapEntries(
   obj: Record<string, unknown>,