forge-sql-orm 2.0.12 → 2.0.14

package/src/lib/drizzle/extensions/selectAliased.ts

@@ -1,74 +1,72 @@
-import {MySqlRemoteDatabase} from "drizzle-orm/mysql-proxy";
-import type {SelectedFields} from "drizzle-orm/mysql-core/query-builders/select.types";
-import {applyFromDriverTransform, mapSelectFieldsWithAlias} from "../../..";
-import {MySqlSelectBuilder} from "drizzle-orm/mysql-core";
-import {MySqlRemotePreparedQueryHKT} from "drizzle-orm/mysql-proxy";
+import { MySqlRemoteDatabase } from "drizzle-orm/mysql-proxy";
+import type { SelectedFields } from "drizzle-orm/mysql-core/query-builders/select.types";
+import { applyFromDriverTransform, mapSelectFieldsWithAlias } from "../../..";
+import { MySqlSelectBuilder } from "drizzle-orm/mysql-core";
+import { MySqlRemotePreparedQueryHKT } from "drizzle-orm/mysql-proxy";
 
 function createAliasedSelectBuilder<TSelection extends SelectedFields>(
-    db: MySqlRemoteDatabase<any>,
-    fields: TSelection,
-    selectFn: (selections: any) => MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>
+  db: MySqlRemoteDatabase<any>,
+  fields: TSelection,
+  selectFn: (selections: any) => MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>,
 ): MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT> {
-    const { selections, aliasMap } = mapSelectFieldsWithAlias(fields);
-    const builder = selectFn(selections);
+  const { selections, aliasMap } = mapSelectFieldsWithAlias(fields);
+  const builder = selectFn(selections);
 
-    const wrapBuilder = (rawBuilder: any): any => {
-        return new Proxy(rawBuilder, {
-            get(target, prop, receiver) {
-                if (prop === 'execute') {
-                    return async (...args: any[]) => {
-                        const rows = await target.execute(...args);
-                        return applyFromDriverTransform(rows, selections, aliasMap);
-                    };
-                }
+  const wrapBuilder = (rawBuilder: any): any => {
+    return new Proxy(rawBuilder, {
+      get(target, prop, receiver) {
+        if (prop === "execute") {
+          return async (...args: any[]) => {
+            const rows = await target.execute(...args);
+            return applyFromDriverTransform(rows, selections, aliasMap);
+          };
+        }
 
-                if (prop === 'then') {
-                    return (onfulfilled: any, onrejected: any) =>
-                        target.execute().then(
-                            (rows: unknown[]) => {
-                                const transformed = applyFromDriverTransform(rows, selections, aliasMap);
-                                return onfulfilled?.(transformed);
-                            },
-                            onrejected,
-                        );
-                }
+        if (prop === "then") {
+          return (onfulfilled: any, onrejected: any) =>
+            target.execute().then((rows: unknown[]) => {
+              const transformed = applyFromDriverTransform(rows, selections, aliasMap);
+              return onfulfilled?.(transformed);
+            }, onrejected);
+        }
 
-                const value = Reflect.get(target, prop, receiver);
+        const value = Reflect.get(target, prop, receiver);
 
-                if (typeof value === 'function') {
-                    return (...args: any[]) => {
-                        const result = value.apply(target, args);
+        if (typeof value === "function") {
+          return (...args: any[]) => {
+            const result = value.apply(target, args);
 
-                        if (typeof result === 'object' && result !== null && 'execute' in result) {
-                            return wrapBuilder(result);
-                        }
+            if (typeof result === "object" && result !== null && "execute" in result) {
+              return wrapBuilder(result);
+            }
 
-                        return result;
-                    };
-                }
+            return result;
+          };
+        }
 
-                return value;
-            },
-        });
-    };
+        return value;
+      },
+    });
+  };
 
-    return wrapBuilder(builder);
+  return wrapBuilder(builder);
 }
 
 export function patchDbWithSelectAliased(db: MySqlRemoteDatabase<any>): MySqlRemoteDatabase<any> & {
-    selectAliased:<TSelection extends SelectedFields>(
-        fields: TSelection,
-    )=> MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>,
-    selectAliasedDistinct:<TSelection extends SelectedFields>(
-        fields: TSelection,
-    )=> MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>  } {
-    db.selectAliased = function <TSelection extends SelectedFields>(fields: TSelection) {
-        return createAliasedSelectBuilder(db, fields, (selections) => db.select(selections));
-    };
+  selectAliased: <TSelection extends SelectedFields>(
+    fields: TSelection,
+  ) => MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
+  selectAliasedDistinct: <TSelection extends SelectedFields>(
+    fields: TSelection,
+  ) => MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
+} {
+  db.selectAliased = function <TSelection extends SelectedFields>(fields: TSelection) {
+    return createAliasedSelectBuilder(db, fields, (selections) => db.select(selections));
+  };
 
-    db.selectAliasedDistinct = function <TSelection extends SelectedFields>(fields: TSelection) {
-        return createAliasedSelectBuilder(db, fields, (selections) => db.selectDistinct(selections));
-    };
+  db.selectAliasedDistinct = function <TSelection extends SelectedFields>(fields: TSelection) {
+    return createAliasedSelectBuilder(db, fields, (selections) => db.selectDistinct(selections));
+  };
 
-    return db;
-}
+  return db;
+}

package/src/lib/drizzle/extensions/types.d.ts

@@ -1,14 +1,14 @@
-import { SelectedFields } from 'drizzle-orm';
-import {MySqlSelectBuilder} from "drizzle-orm/mysql-core";
-import {MySqlRemotePreparedQueryHKT} from "drizzle-orm/mysql-proxy";
+import { SelectedFields } from "drizzle-orm";
+import { MySqlSelectBuilder } from "drizzle-orm/mysql-core";
+import { MySqlRemotePreparedQueryHKT } from "drizzle-orm/mysql-proxy";
 
-declare module 'drizzle-orm/mysql-proxy' {
-    interface MySqlRemoteDatabase<> {
-        selectAliased<TSelection extends SelectedFields>(
-            fields: TSelection,
-        ): MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
-        selectAliasedDistinct<TSelection extends SelectedFields>(
-            fields: TSelection,
-        ): MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
-    }
-}
+declare module "drizzle-orm/mysql-proxy" {
+  interface MySqlRemoteDatabase<> {
+    selectAliased<TSelection extends SelectedFields>(
+      fields: TSelection,
+    ): MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
+    selectAliasedDistinct<TSelection extends SelectedFields>(
+      fields: TSelection,
+    ): MySqlSelectBuilder<TSelection, MySqlRemotePreparedQueryHKT>;
+  }
+}

package/src/utils/sqlUtils.ts

@@ -1,6 +1,6 @@
 import moment from "moment";
-import {AnyColumn, Column, isTable, SQL, sql, StringChunk} from "drizzle-orm";
-import {AnyMySqlTable, MySqlCustomColumn} from "drizzle-orm/mysql-core/index";
+import { AnyColumn, Column, isTable, SQL, sql, StringChunk } from "drizzle-orm";
+import { AnyMySqlTable, MySqlCustomColumn } from "drizzle-orm/mysql-core/index";
 import { PrimaryKeyBuilder } from "drizzle-orm/mysql-core/primary-keys";
 import { AnyIndexBuilder } from "drizzle-orm/mysql-core/indexes";
 import { CheckBuilder } from "drizzle-orm/mysql-core/checks";
@@ -8,8 +8,7 @@ import { ForeignKeyBuilder } from "drizzle-orm/mysql-core/foreign-keys";
 import { UniqueConstraintBuilder } from "drizzle-orm/mysql-core/unique-constraint";
 import type { SelectedFields } from "drizzle-orm/mysql-core/query-builders/select.types";
 import { MySqlTable } from "drizzle-orm/mysql-core";
-import { getTableName } from "drizzle-orm/table";
-import {isSQLWrapper} from "drizzle-orm/sql/sql";
+import { isSQLWrapper } from "drizzle-orm/sql/sql";
 
 /**
  * Interface representing table metadata information
@@ -48,11 +47,11 @@ interface ConfigBuilderData {
  * @returns Date object
  */
 export const parseDateTime = (value: string, format: string): Date => {
-    const m = moment(value, format, true);
-    if (!m.isValid()) {
-        return moment(value).toDate();
-    }
-    return m.toDate();
+  const m = moment(value, format, true);
+  if (!m.isValid()) {
+    return moment(value).toDate();
+  }
+  return m.toDate();
 };
 
 /**
@@ -61,8 +60,8 @@ export const parseDateTime = (value: string, format: string): Date => {
  * @returns The extracted alias or the original query if no alias found
  */
 export function extractAlias(query: string): string {
-    const match = query.match(/\bas\s+(['"`]?)([\w*]+)\1$/i);
-    return match ? match[2] : query;
+  const match = query.match(/\bas\s+(['"`]?)([\w*]+)\1$/i);
+  return match ? match[2] : query;
 }
 
 /**
@@ -189,8 +188,8 @@ export function getTableMetadata(table: AnyMySqlTable): MetadataInfo {
   builders.foreignKeys = processForeignKeys(table, foreignKeysSymbol, extraSymbol);
 
   // Process extra configuration if available
-    if (extraSymbol) {
-        // @ts-ignore
+  if (extraSymbol) {
+    // @ts-ignore
     const extraConfigBuilder = table[extraSymbol];
     if (extraConfigBuilder && typeof extraConfigBuilder === "function") {
       const configBuilderData = extraConfigBuilder(table);
@@ -231,7 +230,7 @@ export function getTableMetadata(table: AnyMySqlTable): MetadataInfo {
     }
   }
 
-    return {
+  return {
     tableName: nameSymbol ? (table as any)[nameSymbol] : "",
     columns: columnsSymbol ? ((table as any)[columnsSymbol] as Record<string, AnyColumn>) : {},
     ...builders,
@@ -261,15 +260,15 @@ export function generateDropTableStatements(tables: AnyMySqlTable[]): string[] {
 
 type AliasColumnMap = Record<string, AnyColumn>;
 
-function mapSelectTableToAlias(table: MySqlTable, aliasMap: AliasColumnMap): any {
+function mapSelectTableToAlias(table: MySqlTable,uniqPrefix:string, aliasMap: AliasColumnMap): any {
   const { columns, tableName } = getTableMetadata(table);
   const selectionsTableFields: Record<string, unknown> = {};
   Object.keys(columns).forEach((name) => {
     const column = columns[name] as AnyColumn;
-    const uniqName = `a_${tableName}_${column.name}`;
+    const uniqName = `a_${uniqPrefix}_${tableName}_${column.name}`.toLowerCase();
     const fieldAlias = sql.raw(uniqName);
     selectionsTableFields[name] = sql`${column} as \`${fieldAlias}\``;
-    aliasMap[uniqName]= column;
+    aliasMap[uniqName] = column;
   });
   return selectionsTableFields;
 }
@@ -278,13 +277,19 @@ function isDrizzleColumn(column: any): boolean {
   return column && typeof column === "object" && "table" in column;
 }
 
-export function mapSelectAllFieldsToAlias(selections: any, name: string, fields: any, aliasMap: AliasColumnMap): any {
+export function mapSelectAllFieldsToAlias(
+  selections: any,
+  name: string,
+  uniqName:string,
+  fields: any,
+  aliasMap: AliasColumnMap,
+): any {
   if (isTable(fields)) {
-    selections[name] = mapSelectTableToAlias(fields as MySqlTable, aliasMap);
+    selections[name] = mapSelectTableToAlias(fields as MySqlTable, uniqName, aliasMap);
   } else if (isDrizzleColumn(fields)) {
     const column = fields as Column;
-    const uniqName = `a_${getTableName(column.table)}_${column.name}`;
-    let aliasName = sql.raw(uniqName);
+    const uniqAliasName = `a_${uniqName}_${column.name}`.toLowerCase();
+    let aliasName = sql.raw(uniqAliasName);
     selections[name] = sql`${column} as \`${aliasName}\``;
     aliasMap[uniqName] = column;
   } else if (isSQLWrapper(fields)) {
@@ -292,7 +297,7 @@ export function mapSelectAllFieldsToAlias(selections: any, name: string, fields:
   } else {
     const innerSelections: any = {};
     Object.entries(fields).forEach(([iname, ifields]) => {
-      mapSelectAllFieldsToAlias(innerSelections, iname, ifields, aliasMap);
+      mapSelectAllFieldsToAlias(innerSelections, iname, `${uniqName}_${iname}`, ifields, aliasMap);
     });
     selections[name] = innerSelections;
   }
@@ -307,40 +312,41 @@ export function mapSelectFieldsWithAlias<TSelection extends SelectedFields>(
   const aliasMap: AliasColumnMap = {};
   const selections: any = {};
   Object.entries(fields).forEach(([name, fields]) => {
-    mapSelectAllFieldsToAlias(selections, name, fields, aliasMap);
+    mapSelectAllFieldsToAlias(selections, name,name, fields, aliasMap);
   });
-  return {selections, aliasMap};
+  return { selections, aliasMap };
 }
 
-
-
-function getAliasFromDrizzleAlias(value: unknown): string|undefined {
-  const isSQL = value !== null &&
-      typeof value === 'object' &&
-      isSQLWrapper(value) && 'queryChunks' in value;
-  if (isSQL){
-    const  sql = value as SQL;
+function getAliasFromDrizzleAlias(value: unknown): string | undefined {
+  const isSQL =
+    value !== null && typeof value === "object" && isSQLWrapper(value) && "queryChunks" in value;
+  if (isSQL) {
+    const sql = value as SQL;
     const queryChunks = sql.queryChunks;
-    if (queryChunks.length>3){
-      const aliasNameChunk = queryChunks[queryChunks.length-2];
-      if (isSQLWrapper(aliasNameChunk) && 'queryChunks' in aliasNameChunk){
-        const  aliasNameChunkSql = aliasNameChunk as SQL;
+    if (queryChunks.length > 3) {
+      const aliasNameChunk = queryChunks[queryChunks.length - 2];
+      if (isSQLWrapper(aliasNameChunk) && "queryChunks" in aliasNameChunk) {
+        const aliasNameChunkSql = aliasNameChunk as SQL;
         if (aliasNameChunkSql && aliasNameChunkSql.queryChunks.length === 1) {
           const queryChunksStringChunc = aliasNameChunkSql.queryChunks[0];
-          if (queryChunksStringChunc && 'value' in queryChunksStringChunc) {
+          if (queryChunksStringChunc && "value" in queryChunksStringChunc) {
             const values = (queryChunksStringChunc as StringChunk).value;
-            if (values && values.length===1){
-              return values[0]
+            if (values && values.length === 1) {
+              return values[0];
             }
           }
         }
       }
     }
   }
-  return undefined
+  return undefined;
 }
 
-function transformValue(value: unknown, alias: string, aliasMap: Record<string, AnyColumn>): unknown {
+function transformValue(
+  value: unknown,
+  alias: string,
+  aliasMap: Record<string, AnyColumn>,
+): unknown {
   const column = aliasMap[alias];
   if (!column) return value;
 
@@ -353,16 +359,24 @@ function transformValue(value: unknown, alias: string, aliasMap: Record<string,
   return value;
 }
 
-function transformObject(obj: Record<string, unknown>, selections: Record<string, unknown>, aliasMap: Record<string, AnyColumn>): Record<string, unknown> {
+function transformObject(
+  obj: Record<string, unknown>,
+  selections: Record<string, unknown>,
+  aliasMap: Record<string, AnyColumn>,
+): Record<string, unknown> {
   const result: Record<string, unknown> = {};
 
   for (const [key, value] of Object.entries(obj)) {
     const selection = selections[key];
     const alias = getAliasFromDrizzleAlias(selection);
     if (alias && aliasMap[alias]) {
-        result[key] = transformValue(value, alias, aliasMap);
-    } else if (selection && typeof selection === 'object' && !isSQLWrapper(selection)) {
-      result[key] = transformObject(value as Record<string, unknown>, selection as Record<string, unknown>, aliasMap);
+      result[key] = transformValue(value, alias, aliasMap);
+    } else if (selection && typeof selection === "object" && !isSQLWrapper(selection)) {
+      result[key] = transformObject(
+        value as Record<string, unknown>,
+        selection as Record<string, unknown>,
+        aliasMap,
+      );
     } else {
       result[key] = value;
     }
@@ -374,9 +388,44 @@ function transformObject(obj: Record<string, unknown>, selections: Record<string
 export function applyFromDriverTransform<T, TSelection>(
   rows: T[],
   selections: TSelection,
-  aliasMap: Record<string, AnyColumn>
+  aliasMap: Record<string, AnyColumn>,
 ): T[] {
   return rows.map((row) => {
-    return transformObject(row as Record<string, unknown>, selections as Record<string, unknown>, aliasMap) as T;
+    const transformed = transformObject(
+      row as Record<string, unknown>,
+      selections as Record<string, unknown>,
+      aliasMap,
+    ) as Record<string, unknown>;
+
+    return processNullBranches(transformed) as unknown as T;
   });
 }
+
+function processNullBranches(obj: Record<string, unknown>): Record<string, unknown> | null {
+  if (obj === null || typeof obj !== 'object' || obj===undefined) {
+    return obj;
+  }
+
+  const result: Record<string, unknown> = {};
+  let allNull = true;
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === null || value===undefined) {
+      result[key] = null;
+      continue;
+    }
+
+    if (typeof value === 'object' && (value !== null || value !== undefined) ) {
+      const processed = processNullBranches(value as Record<string, unknown>);
+      result[key] = processed;
+      if (processed !== null) {
+        allNull = false;
+      }
+    } else {
+      result[key] = value;
+      allNull = false;
+    }
+  }
+
+  return allNull ? null : result;
+}