@ignisia/sql 0.4.2 → 0.4.3

package/dist/cjs/query/sql.js

@@ -68,7 +68,7 @@ function toQuery(dialect = this.table.dialect) {
     parts.push("OFFSET ?");
     params.push(this.definition.offset);
   }
-  if (this.definition.queryType === constants.QueryType.UPDATE || this.definition.queryType === constants.QueryType.DELETE) {
+  if (this.definition.queryType === constants.QueryType.INSERT || this.definition.queryType === constants.QueryType.UPDATE || this.definition.queryType === constants.QueryType.DELETE) {
     if (dialect !== constants$1.Dialect.MYSQL) {
       parts.push("RETURNING *");
     }
@@ -109,9 +109,10 @@ async function exec(tx) {
   const client = this.table.client;
   const dialect = this.table.dialect;
   const queryType = this.definition.queryType;
+  const isInsert = queryType === constants.QueryType.INSERT;
   const isUpdate = queryType === constants.QueryType.UPDATE;
   const isDelete = queryType === constants.QueryType.DELETE;
-  const isReturning = isUpdate || isDelete;
+  const isReturning = isInsert || isUpdate || isDelete;
   const isMySQL = dialect === constants$1.Dialect.MYSQL;
   if (!client) {
     throw new Error("Database client not defined");
@@ -132,6 +133,9 @@ async function exec(tx) {
   }
   let result = [];
   let mySqlResult = [];
+  const primaryKeyColumn = Object.entries(this.table.columns).find(
+    ([, col]) => col.definition.primaryKey
+  )?.[0];
   if (isMySQL && isDelete) {
     const query2 = this.clone().select(`${this.table.name}.*`);
     mySqlResult = await client.exec({
@@ -145,6 +149,22 @@ async function exec(tx) {
     params,
     tx
   });
+  if (isMySQL && isInsert && primaryKeyColumn) {
+    const insertResult = result;
+    const lastId = insertResult.lastInsertRowid;
+    if (lastId != null) {
+      const selectQuery = this.table.query().where(
+        `${this.table.name}."${primaryKeyColumn}"`,
+        "eq",
+        lastId
+      );
+      mySqlResult = await client.exec({
+        sql: selectQuery.toQuery().query,
+        params: selectQuery.toQuery().params,
+        tx
+      });
+    }
+  }
   if (isMySQL && isUpdate) {
     const query2 = this.clone().select(`${this.table.name}.*`);
     mySqlResult = await client.exec({

package/dist/esm/database/alter.d.ts

@@ -1,7 +1,7 @@
-import { D as Database } from '../index-BWg1JZRt.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
 import { AcceptedColumnTypes } from '../column/constants.js';
-import { T as Table, D as DatabaseDefinition } from '../index-CsVPGz2o.js';
+import { T as Table, D as DatabaseDefinition } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/column.d.ts

@@ -1,6 +1,6 @@
-import { D as Database } from '../index-BWg1JZRt.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
-import { T as Table, D as DatabaseDefinition } from '../index-CsVPGz2o.js';
+import { T as Table, D as DatabaseDefinition } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/contract.d.ts

@@ -1,7 +1,7 @@
-export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-BWg1JZRt.js';
+export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-B4y4GiNB.js';
 import '../column/index.js';
 import '../column/constants.js';
-import '../index-CsVPGz2o.js';
+import '../index-CARBkj9h.js';
 import '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/index.d.ts

@@ -1,9 +1,9 @@
 import 'bun';
 import '../column/index.js';
-import '../index-CsVPGz2o.js';
+import '../index-CARBkj9h.js';
 import '../query/constants.js';
 import '../table/constants.js';
-export { D as Database } from '../index-BWg1JZRt.js';
+export { D as Database } from '../index-B4y4GiNB.js';
 import '../column/constants.js';
 import '../column/types.js';
 import '../types.js';

package/dist/esm/database/table.d.ts

@@ -1,6 +1,6 @@
-import { D as Database } from '../index-BWg1JZRt.js';
+import { D as Database } from '../index-B4y4GiNB.js';
 import { Column } from '../column/index.js';
-import { T as Table, D as DatabaseDefinition, h as TimestampOptions, M as MergeTimestampParanoid } from '../index-CsVPGz2o.js';
+import { T as Table, D as DatabaseDefinition, c as TimestampOptions, M as MergeTimestampParanoid } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import 'bun';
 import '../query/constants.js';

package/dist/esm/database/types.d.ts

@@ -1,6 +1,6 @@
 import 'bun';
 import '../column/index.js';
-export { D as DatabaseDefinition, j as DatabaseDialect, k as DatabaseExecOptions, o as DatabaseOptions, l as MysqlConfig, P as PostgresConfig, x as SqlConfig, i as SqlConfigMapping, m as SqliteConfig } from '../index-CsVPGz2o.js';
+export { D as DatabaseDefinition, d as DatabaseDialect, e as DatabaseExecOptions, o as DatabaseOptions, f as MysqlConfig, P as PostgresConfig, x as SqlConfig, S as SqlConfigMapping, g as SqliteConfig } from '../index-CARBkj9h.js';
 import '../table/constants.js';
 import '../column/constants.js';
 import '../column/types.js';

package/dist/esm/database/wrapper.d.ts

@@ -1,6 +1,6 @@
 import { SQL, TransactionSQL } from 'bun';
 import { Dialect } from '../table/constants.js';
-import { i as SqlConfigMapping, j as DatabaseDialect, k as DatabaseExecOptions, P as PostgresConfig, l as MysqlConfig, m as SqliteConfig } from '../index-CsVPGz2o.js';
+import { S as SqlConfigMapping, d as DatabaseDialect, e as DatabaseExecOptions, P as PostgresConfig, f as MysqlConfig, g as SqliteConfig } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import '../column/constants.js';
 import '../column/types.js';

package/dist/esm/{index-BWg1JZRt.d.ts → index-B4y4GiNB.d.ts}

@@ -1,6 +1,6 @@
 import { TransactionSQL } from 'bun';
 import { Column } from './column/index.js';
-import { T as Table, D as DatabaseDefinition, h as TimestampOptions, M as MergeTimestampParanoid, n as QueryHooks, j as DatabaseDialect, o as DatabaseOptions, c as QueryBuilder, p as QueryRunHooks } from './index-CsVPGz2o.js';
+import { T as Table, D as DatabaseDefinition, c as TimestampOptions, M as MergeTimestampParanoid, n as QueryHooks, d as DatabaseDialect, o as DatabaseOptions, i as QueryBuilder, p as QueryRunHooks } from './index-CARBkj9h.js';
 import { QueryHooksType } from './query/constants.js';
 import { Dialect } from './table/constants.js';
 import { AcceptedColumnTypes } from './column/constants.js';

package/dist/esm/{index-CsVPGz2o.d.ts → index-CARBkj9h.d.ts}

@@ -497,4 +497,4 @@ declare class QueryBuilder<Alias extends TableRef['name'], TableRef extends Tabl
     infer(): this['_output'];
 }
 
-export { clone as $, type AliasedColumn as A, deletedAt as B, type ColumnSelector as C, type DatabaseDefinition as D, type ExplainOptions as E, defineColumns as F, type GroupNode as G, type TableOptions as H, type TableOutput as I, type JoinNode as J, type ExecOptions as K, type SingleValueComparisonNode as L, type MergeTimestampParanoid as M, type MultiValueComparisonNode as N, type NullValueComparisonNode as O, type PostgresConfig as P, type QueryDefinition as Q, type RawColumn as R, type StrictColumnSelector as S, Table as T, type ComparisonNode as U, type NotNode as V, type WhereValue as W, type BaseJoinNode as X, type NonCrossNaturalJoinNode as Y, type CrossNaturalJoinNode as Z, alias as _, addCondition as a, col as a0, aggregateCol as a1, addGroupCondition as b, QueryBuilder as c, type SelectableColumn as d, type QueryTransformerContract as e, type QueryConditionContract as f, type AstNode as g, type TimestampOptions as h, type SqlConfigMapping as i, type DatabaseDialect as j, type DatabaseExecOptions as k, type MysqlConfig as l, type SqliteConfig as m, type QueryHooks as n, type DatabaseOptions as o, type QueryRunHooks as p, type AcceptedOrderBy as q, type AcceptedInsertValues as r, type AcceptedUpdateValues as s, type AggregateColumn as t, type SelectQueryOutput as u, type QueryOutput as v, type QueryRunHooksOptions as w, type SqlConfig as x, createdAt as y, updatedAt as z };
+export { clone as $, type AliasedColumn as A, deletedAt as B, type ColumnSelector as C, type DatabaseDefinition as D, type ExplainOptions as E, defineColumns as F, type GroupNode as G, type TableOptions as H, type TableOutput as I, type JoinNode as J, type ExecOptions as K, type SingleValueComparisonNode as L, type MergeTimestampParanoid as M, type MultiValueComparisonNode as N, type NullValueComparisonNode as O, type PostgresConfig as P, type QueryDefinition as Q, type RawColumn as R, type SqlConfigMapping as S, Table as T, type ComparisonNode as U, type NotNode as V, type WhereValue as W, type BaseJoinNode as X, type NonCrossNaturalJoinNode as Y, type CrossNaturalJoinNode as Z, alias as _, addCondition as a, col as a0, aggregateCol as a1, addGroupCondition as b, type TimestampOptions as c, type DatabaseDialect as d, type DatabaseExecOptions as e, type MysqlConfig as f, type SqliteConfig as g, type StrictColumnSelector as h, QueryBuilder as i, type SelectableColumn as j, type QueryTransformerContract as k, type QueryConditionContract as l, type AstNode as m, type QueryHooks as n, type DatabaseOptions as o, type QueryRunHooks as p, type AcceptedOrderBy as q, type AcceptedInsertValues as r, type AcceptedUpdateValues as s, type AggregateColumn as t, type SelectQueryOutput as u, type QueryOutput as v, type QueryRunHooksOptions as w, type SqlConfig as x, createdAt as y, updatedAt as z };

package/dist/esm/index.d.ts

@@ -1,7 +1,7 @@
 export { Column } from './column/index.js';
-export { D as Database } from './index-BWg1JZRt.js';
+export { D as Database } from './index-B4y4GiNB.js';
 export { Migration } from './migration/index.js';
-export { c as QueryBuilder, T as Table } from './index-CsVPGz2o.js';
+export { i as QueryBuilder, T as Table } from './index-CARBkj9h.js';
 import './table/constants.js';
 import './column/constants.js';
 import './column/types.js';

package/dist/esm/migration/index.d.ts

@@ -1,6 +1,6 @@
 import { Column } from '../column/index.js';
-import { D as Database } from '../index-BWg1JZRt.js';
-import { T as Table } from '../index-CsVPGz2o.js';
+import { D as Database } from '../index-B4y4GiNB.js';
+import { T as Table } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import { MigrationOptions, MigrationFn } from './type.js';
 import '../column/constants.js';

package/dist/esm/migration/type.d.ts

@@ -1,6 +1,6 @@
 import { Column } from '../column/index.js';
-import { D as Database } from '../index-BWg1JZRt.js';
-import { T as Table } from '../index-CsVPGz2o.js';
+import { D as Database } from '../index-B4y4GiNB.js';
+import { T as Table } from '../index-CARBkj9h.js';
 import { Dialect } from '../table/constants.js';
 import '../column/constants.js';
 import '../column/types.js';

package/dist/esm/query/ast.d.ts

@@ -1,5 +1,5 @@
 import '../column/index.js';
-export { g as AstNode, X as BaseJoinNode, U as ComparisonNode, Z as CrossNaturalJoinNode, G as GroupNode, J as JoinNode, N as MultiValueComparisonNode, Y as NonCrossNaturalJoinNode, V as NotNode, O as NullValueComparisonNode, L as SingleValueComparisonNode } from '../index-CsVPGz2o.js';
+export { m as AstNode, X as BaseJoinNode, U as ComparisonNode, Z as CrossNaturalJoinNode, G as GroupNode, J as JoinNode, N as MultiValueComparisonNode, Y as NonCrossNaturalJoinNode, V as NotNode, O as NullValueComparisonNode, L as SingleValueComparisonNode } from '../index-CARBkj9h.js';
 import './constants.js';
 import '../table/constants.js';
 import '../column/constants.js';

package/dist/esm/query/builder.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder } from '../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder } from '../index-CARBkj9h.js';
 import { Column } from '../column/index.js';
 import 'bun';
 import '../types.js';

package/dist/esm/query/compiler.d.ts

@@ -1,5 +1,5 @@
 import { Dialect } from '../table/constants.js';
-import { g as AstNode, J as JoinNode } from '../index-CsVPGz2o.js';
+import { m as AstNode, J as JoinNode } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import '../column/constants.js';
 import '../column/types.js';

package/dist/esm/query/condition/common.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, W as WhereValue, c as QueryBuilder, e as QueryTransformerContract, f as QueryConditionContract, G as GroupNode } from '../../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, W as WhereValue, i as QueryBuilder, k as QueryTransformerContract, l as QueryConditionContract, G as GroupNode } from '../../index-CARBkj9h.js';
 import { Column } from '../../column/index.js';
 import { AcceptedOperator } from '../constants.js';
 import 'bun';

package/dist/esm/query/condition/core.d.ts

@@ -1,4 +1,4 @@
-export { a as addCondition, b as addGroupCondition } from '../../index-CsVPGz2o.js';
+export { a as addCondition, b as addGroupCondition } from '../../index-CARBkj9h.js';
 import '../../column/index.js';
 import '../constants.js';
 import 'bun';

package/dist/esm/query/condition/index.d.ts

@@ -1,5 +1,5 @@
 export { having, or, orGroup, where, whereGroup } from './common.js';
-export { a as addCondition, b as addGroupCondition } from '../../index-CsVPGz2o.js';
+export { a as addCondition, b as addGroupCondition } from '../../index-CARBkj9h.js';
 export { havingNot, orNot, orNotGroup, whereNot, whereNotGroup } from './not.js';
 import '../../column/index.js';
 import '../../table/constants.js';

package/dist/esm/query/condition/not.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, W as WhereValue, c as QueryBuilder, e as QueryTransformerContract, f as QueryConditionContract, G as GroupNode } from '../../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, W as WhereValue, i as QueryBuilder, k as QueryTransformerContract, l as QueryConditionContract, G as GroupNode } from '../../index-CARBkj9h.js';
 import { Column } from '../../column/index.js';
 import { AcceptedOperator } from '../constants.js';
 import 'bun';

package/dist/esm/query/contract.d.ts

@@ -1,5 +1,5 @@
 import 'bun';
-export { f as QueryConditionContract, e as QueryTransformerContract } from '../index-CsVPGz2o.js';
+export { l as QueryConditionContract, k as QueryTransformerContract } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import '../table/constants.js';
 import './constants.js';

package/dist/esm/query/explain.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, E as ExplainOptions } from '../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, E as ExplainOptions } from '../index-CARBkj9h.js';
 import { Column } from '../column/index.js';
 import 'bun';
 import '../types.js';

package/dist/esm/query/helper.d.ts

@@ -1,4 +1,4 @@
-export { a1 as aggregateCol, _ as alias, $ as clone, a0 as col } from '../index-CsVPGz2o.js';
+export { a1 as aggregateCol, _ as alias, $ as clone, a0 as col } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import './constants.js';
 import 'bun';

package/dist/esm/query/index.d.ts

@@ -1,4 +1,4 @@
-export { c as QueryBuilder } from '../index-CsVPGz2o.js';
+export { i as QueryBuilder } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import '../types.js';
 import './constants.js';

package/dist/esm/query/join.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, J as JoinNode, e as QueryTransformerContract, f as QueryConditionContract } from '../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, J as JoinNode, k as QueryTransformerContract, l as QueryConditionContract } from '../index-CARBkj9h.js';
 import { Column } from '../column/index.js';
 import { AcceptedJoin } from './constants.js';
 import 'bun';

package/dist/esm/query/sql.d.ts

@@ -1,5 +1,5 @@
 import { TransactionSQL } from 'bun';
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, E as ExplainOptions } from '../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, E as ExplainOptions } from '../index-CARBkj9h.js';
 import { Column } from '../column/index.js';
 import { Dialect } from '../table/constants.js';
 import '../types.js';

package/dist/esm/query/sql.js

@@ -67,7 +67,7 @@ function toQuery(dialect = this.table.dialect) {
     parts.push("OFFSET ?");
     params.push(this.definition.offset);
   }
-  if (this.definition.queryType === QueryType.UPDATE || this.definition.queryType === QueryType.DELETE) {
+  if (this.definition.queryType === QueryType.INSERT || this.definition.queryType === QueryType.UPDATE || this.definition.queryType === QueryType.DELETE) {
     if (dialect !== Dialect.MYSQL) {
       parts.push("RETURNING *");
     }
@@ -108,9 +108,10 @@ async function exec(tx) {
   const client = this.table.client;
   const dialect = this.table.dialect;
   const queryType = this.definition.queryType;
+  const isInsert = queryType === QueryType.INSERT;
   const isUpdate = queryType === QueryType.UPDATE;
   const isDelete = queryType === QueryType.DELETE;
-  const isReturning = isUpdate || isDelete;
+  const isReturning = isInsert || isUpdate || isDelete;
   const isMySQL = dialect === Dialect.MYSQL;
   if (!client) {
     throw new Error("Database client not defined");
@@ -131,6 +132,9 @@ async function exec(tx) {
   }
   let result = [];
   let mySqlResult = [];
+  const primaryKeyColumn = Object.entries(this.table.columns).find(
+    ([, col]) => col.definition.primaryKey
+  )?.[0];
   if (isMySQL && isDelete) {
     const query2 = this.clone().select(`${this.table.name}.*`);
     mySqlResult = await client.exec({
@@ -144,6 +148,22 @@ async function exec(tx) {
     params,
     tx
   });
+  if (isMySQL && isInsert && primaryKeyColumn) {
+    const insertResult = result;
+    const lastId = insertResult.lastInsertRowid;
+    if (lastId != null) {
+      const selectQuery = this.table.query().where(
+        `${this.table.name}."${primaryKeyColumn}"`,
+        "eq",
+        lastId
+      );
+      mySqlResult = await client.exec({
+        sql: selectQuery.toQuery().query,
+        params: selectQuery.toQuery().params,
+        tx
+      });
+    }
+  }
   if (isMySQL && isUpdate) {
     const query2 = this.clone().select(`${this.table.name}.*`);
     mySqlResult = await client.exec({

package/dist/esm/query/types.d.ts

@@ -1,7 +1,7 @@
 import 'bun';
 import '../column/index.js';
 import '../column/constants.js';
-export { r as AcceptedInsertValues, q as AcceptedOrderBy, s as AcceptedUpdateValues, t as AggregateColumn, A as AliasedColumn, C as ColumnSelector, E as ExplainOptions, Q as QueryDefinition, n as QueryHooks, v as QueryOutput, p as QueryRunHooks, w as QueryRunHooksOptions, R as RawColumn, u as SelectQueryOutput, d as SelectableColumn, S as StrictColumnSelector, W as WhereValue } from '../index-CsVPGz2o.js';
+export { r as AcceptedInsertValues, q as AcceptedOrderBy, s as AcceptedUpdateValues, t as AggregateColumn, A as AliasedColumn, C as ColumnSelector, E as ExplainOptions, Q as QueryDefinition, n as QueryHooks, v as QueryOutput, p as QueryRunHooks, w as QueryRunHooksOptions, R as RawColumn, u as SelectQueryOutput, j as SelectableColumn, h as StrictColumnSelector, W as WhereValue } from '../index-CARBkj9h.js';
 import '../types.js';
 import './constants.js';
 import '../table/constants.js';

package/dist/esm/query/utilities.d.ts

@@ -1,4 +1,4 @@
-import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, A as AliasedColumn, d as SelectableColumn } from '../index-CsVPGz2o.js';
+import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, A as AliasedColumn, j as SelectableColumn } from '../index-CARBkj9h.js';
 import { Column } from '../column/index.js';
 import 'bun';
 import '../types.js';

package/dist/esm/table/index.d.ts

@@ -1,4 +1,4 @@
-export { T as Table } from '../index-CsVPGz2o.js';
+export { T as Table } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import './constants.js';
 import 'bun';

package/dist/esm/table/types.d.ts

@@ -1,5 +1,5 @@
 import 'bun';
-export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput, h as TimestampOptions } from '../index-CsVPGz2o.js';
+export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput, c as TimestampOptions } from '../index-CARBkj9h.js';
 import '../column/index.js';
 import './constants.js';
 import '../types.js';

package/dist/esm/table/utilities.d.ts

@@ -1,7 +1,7 @@
 import '../column/constants.js';
 import '../column/index.js';
 import './constants.js';
-export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-CsVPGz2o.js';
+export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-CARBkj9h.js';
 import '../column/types.js';
 import 'bun';
 import '../types.js';

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "exports": {
     ".": {