@type32/tauri-sqlite-orm 0.1.18-13 → 0.1.18-16

package/dist/index.d.mts

@@ -58,13 +58,14 @@ declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns exten
     private joins;
     private includeRelations;
     private selectedTableAlias;
+    private selectedColumns;
     constructor(db: Database, table: TTable, columns?: TSelectedColumns | undefined);
     distinct(): this;
     groupBy(...columns: AnySQLiteColumn[]): this;
     having(condition: SQLCondition): this;
     leftJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
     innerJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
-    include(relations: Record<string, boolean>): this;
+    include(relations: Partial<Record<keyof TTable['relations'], boolean>>): this;
     private buildJoins;
     execute(): Promise<any[]>;
     private processRelationResults;

package/dist/index.d.ts

@@ -58,13 +58,14 @@ declare class SelectQueryBuilder<TTable extends AnyTable, TSelectedColumns exten
     private joins;
     private includeRelations;
     private selectedTableAlias;
+    private selectedColumns;
     constructor(db: Database, table: TTable, columns?: TSelectedColumns | undefined);
     distinct(): this;
     groupBy(...columns: AnySQLiteColumn[]): this;
     having(condition: SQLCondition): this;
     leftJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
     innerJoin<T extends AnyTable>(table: T, condition: SQLCondition, alias: string): this;
-    include(relations: Record<string, boolean>): this;
+    include(relations: Partial<Record<keyof TTable['relations'], boolean>>): this;
     private buildJoins;
     execute(): Promise<any[]>;
     private processRelationResults;

package/dist/index.js

@@ -186,8 +186,8 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     this.table = table;
     this.columns = columns;
     this.selectedTableAlias = table._.name;
-    const columnNames = columns ? columns.map((c) => `${this.selectedTableAlias}.${table._.columns[c]._.name}`) : [`${this.selectedTableAlias}.*`];
-    this.query = `SELECT ${columnNames.join(", ")} FROM ${table._.name} ${this.selectedTableAlias}`;
+    this.selectedColumns = columns ? columns.map((c) => `${this.selectedTableAlias}.${table._.columns[c]._.name}`) : [`${this.selectedTableAlias}.*`];
+    this.query = `FROM ${table._.name} ${this.selectedTableAlias}`;
   }
   isDistinct = false;
   groupByColumns = [];
@@ -195,9 +195,9 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   joins = [];
   includeRelations = {};
   selectedTableAlias;
+  selectedColumns = [];
   distinct() {
     this.isDistinct = true;
-    this.query = this.query.replace("SELECT", "SELECT DISTINCT");
     return this;
   }
   groupBy(...columns) {
@@ -214,10 +214,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   }
   leftJoin(table, condition, alias2) {
     this.joins.push({ type: "LEFT", table, condition, alias: alias2 });
+    this.selectedColumns.push(`${alias2}.*`);
     return this;
   }
   innerJoin(table, condition, alias2) {
     this.joins.push({ type: "INNER", table, condition, alias: alias2 });
+    this.selectedColumns.push(`${alias2}.*`);
     return this;
   }
   include(relations2) {
@@ -234,9 +236,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     for (const [relationName, include] of Object.entries(this.includeRelations)) {
       if (!include) continue;
       const relation = this.table.relations[relationName];
-      if (!relation) continue;
+      if (!relation) {
+        console.warn(
+          `[Tauri-ORM] Relation "${relationName}" not found on table "${this.table._.name}". Skipping include.`
+        );
+        continue;
+      }
       const foreignTable = relation.foreignTable;
       const foreignAlias = `${this.selectedTableAlias}_${relationName}`;
+      this.selectedColumns.push(`${foreignAlias}.*`);
       if (relation.type === "one" && relation.fields && relation.references) {
         const conditions = relation.fields.map((field, i) => {
           const localColumn = `${this.selectedTableAlias}.${field._.name}`;
@@ -266,10 +274,6 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
           const condition = conditions.length > 1 ? and(...conditions) : conditions[0];
           sql2 += ` LEFT JOIN ${foreignTable._.name} ${foreignAlias} ON ${condition.sql}`;
           params.push(...condition.params);
-          this.query = this.query.replace("SELECT ", `SELECT ${this.selectedTableAlias}.*, ${foreignAlias}.* `).replace(
-            `SELECT ${this.selectedTableAlias}.*, `,
-            `SELECT ${this.selectedTableAlias}.*, ${foreignAlias}.*, `
-          );
         }
       }
     }
@@ -278,9 +282,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   // Enhanced execute method that handles relation data mapping
   async execute() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const distinct = this.isDistinct ? "DISTINCT " : "";
+    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${this.query}`;
     this.query += joinSql;
     this.params.push(...joinParams);
     const { sql: sql2, params } = this.build();
+    console.log("Executing SQL:", sql2, "with params:", params);
     const rawResults = await this.db.select(sql2, params);
     if (Object.keys(this.includeRelations).some((key) => this.includeRelations[key])) {
       const processed = this.processRelationResults(rawResults);

package/dist/index.mjs

@@ -119,8 +119,8 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     this.table = table;
     this.columns = columns;
     this.selectedTableAlias = table._.name;
-    const columnNames = columns ? columns.map((c) => `${this.selectedTableAlias}.${table._.columns[c]._.name}`) : [`${this.selectedTableAlias}.*`];
-    this.query = `SELECT ${columnNames.join(", ")} FROM ${table._.name} ${this.selectedTableAlias}`;
+    this.selectedColumns = columns ? columns.map((c) => `${this.selectedTableAlias}.${table._.columns[c]._.name}`) : [`${this.selectedTableAlias}.*`];
+    this.query = `FROM ${table._.name} ${this.selectedTableAlias}`;
   }
   isDistinct = false;
   groupByColumns = [];
@@ -128,9 +128,9 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   joins = [];
   includeRelations = {};
   selectedTableAlias;
+  selectedColumns = [];
   distinct() {
     this.isDistinct = true;
-    this.query = this.query.replace("SELECT", "SELECT DISTINCT");
     return this;
   }
   groupBy(...columns) {
@@ -147,10 +147,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   }
   leftJoin(table, condition, alias2) {
     this.joins.push({ type: "LEFT", table, condition, alias: alias2 });
+    this.selectedColumns.push(`${alias2}.*`);
     return this;
   }
   innerJoin(table, condition, alias2) {
     this.joins.push({ type: "INNER", table, condition, alias: alias2 });
+    this.selectedColumns.push(`${alias2}.*`);
     return this;
   }
   include(relations2) {
@@ -167,9 +169,15 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
     for (const [relationName, include] of Object.entries(this.includeRelations)) {
       if (!include) continue;
       const relation = this.table.relations[relationName];
-      if (!relation) continue;
+      if (!relation) {
+        console.warn(
+          `[Tauri-ORM] Relation "${relationName}" not found on table "${this.table._.name}". Skipping include.`
+        );
+        continue;
+      }
       const foreignTable = relation.foreignTable;
       const foreignAlias = `${this.selectedTableAlias}_${relationName}`;
+      this.selectedColumns.push(`${foreignAlias}.*`);
       if (relation.type === "one" && relation.fields && relation.references) {
         const conditions = relation.fields.map((field, i) => {
           const localColumn = `${this.selectedTableAlias}.${field._.name}`;
@@ -199,10 +207,6 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
           const condition = conditions.length > 1 ? and(...conditions) : conditions[0];
           sql2 += ` LEFT JOIN ${foreignTable._.name} ${foreignAlias} ON ${condition.sql}`;
           params.push(...condition.params);
-          this.query = this.query.replace("SELECT ", `SELECT ${this.selectedTableAlias}.*, ${foreignAlias}.* `).replace(
-            `SELECT ${this.selectedTableAlias}.*, `,
-            `SELECT ${this.selectedTableAlias}.*, ${foreignAlias}.*, `
-          );
         }
       }
     }
@@ -211,9 +215,12 @@ var SelectQueryBuilder = class extends BaseQueryBuilder {
   // Enhanced execute method that handles relation data mapping
   async execute() {
     const { sql: joinSql, params: joinParams } = this.buildJoins();
+    const distinct = this.isDistinct ? "DISTINCT " : "";
+    this.query = `SELECT ${distinct}${this.selectedColumns.join(", ")} ${this.query}`;
     this.query += joinSql;
     this.params.push(...joinParams);
     const { sql: sql2, params } = this.build();
+    console.log("Executing SQL:", sql2, "with params:", params);
     const rawResults = await this.db.select(sql2, params);
     if (Object.keys(this.includeRelations).some((key) => this.includeRelations[key])) {
       const processed = this.processRelationResults(rawResults);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@type32/tauri-sqlite-orm",
-  "version": "0.1.18-13",
+  "version": "0.1.18-16",
   "description": "A Drizzle-like ORM for Tauri v2's SQL JS API plugin.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",