@ignisia/sql 0.4.1 → 0.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/database/alter.d.cts +2 -2
- package/dist/cjs/database/column.d.cts +2 -2
- package/dist/cjs/database/contract.d.cts +2 -2
- package/dist/cjs/database/index.d.cts +2 -2
- package/dist/cjs/database/table.d.cts +2 -2
- package/dist/cjs/database/types.d.cts +1 -1
- package/dist/cjs/database/wrapper.d.cts +1 -1
- package/dist/{esm/index-CARBkj9h.d.ts → cjs/index-CY-nPZED.d.cts} +5 -5
- package/dist/cjs/{index-BjgeY76W.d.cts → index-DQRamRz3.d.cts} +1 -1
- package/dist/cjs/index.d.cts +2 -2
- package/dist/cjs/migration/index.d.cts +2 -2
- package/dist/cjs/migration/type.d.cts +2 -2
- package/dist/cjs/query/ast.d.cts +1 -1
- package/dist/cjs/query/builder.d.cts +1 -1
- package/dist/cjs/query/builder.js +1 -1
- package/dist/cjs/query/compiler.d.cts +1 -1
- package/dist/cjs/query/condition/common.d.cts +1 -1
- package/dist/cjs/query/condition/core.d.cts +1 -1
- package/dist/cjs/query/condition/index.d.cts +1 -1
- package/dist/cjs/query/condition/not.d.cts +1 -1
- package/dist/cjs/query/contract.d.cts +1 -1
- package/dist/cjs/query/explain.d.cts +1 -1
- package/dist/cjs/query/helper.d.cts +1 -1
- package/dist/cjs/query/index.d.cts +1 -1
- package/dist/cjs/query/join.d.cts +1 -1
- package/dist/cjs/query/sql.d.cts +1 -1
- package/dist/cjs/query/sql.js +15 -6
- package/dist/cjs/query/types.d.cts +1 -1
- package/dist/cjs/query/utilities.d.cts +1 -1
- package/dist/cjs/table/index.d.cts +1 -1
- package/dist/cjs/table/types.d.cts +1 -1
- package/dist/cjs/table/utilities.d.cts +1 -1
- package/dist/esm/database/alter.d.ts +2 -2
- package/dist/esm/database/column.d.ts +2 -2
- package/dist/esm/database/contract.d.ts +2 -2
- package/dist/esm/database/index.d.ts +2 -2
- package/dist/esm/database/table.d.ts +2 -2
- package/dist/esm/database/types.d.ts +1 -1
- package/dist/esm/database/wrapper.d.ts +1 -1
- package/dist/esm/{index-B4y4GiNB.d.ts → index-BWg1JZRt.d.ts} +1 -1
- package/dist/{cjs/index-K07efKgt.d.cts → esm/index-CsVPGz2o.d.ts} +5 -5
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/migration/index.d.ts +2 -2
- package/dist/esm/migration/type.d.ts +2 -2
- package/dist/esm/query/ast.d.ts +1 -1
- package/dist/esm/query/builder.d.ts +1 -1
- package/dist/esm/query/builder.js +1 -1
- package/dist/esm/query/compiler.d.ts +1 -1
- package/dist/esm/query/condition/common.d.ts +1 -1
- package/dist/esm/query/condition/core.d.ts +1 -1
- package/dist/esm/query/condition/index.d.ts +1 -1
- package/dist/esm/query/condition/not.d.ts +1 -1
- package/dist/esm/query/contract.d.ts +1 -1
- package/dist/esm/query/explain.d.ts +1 -1
- package/dist/esm/query/helper.d.ts +1 -1
- package/dist/esm/query/index.d.ts +1 -1
- package/dist/esm/query/join.d.ts +1 -1
- package/dist/esm/query/sql.d.ts +1 -1
- package/dist/esm/query/sql.js +15 -6
- package/dist/esm/query/types.d.ts +1 -1
- package/dist/esm/query/utilities.d.ts +1 -1
- package/dist/esm/table/index.d.ts +1 -1
- package/dist/esm/table/types.d.ts +1 -1
- package/dist/esm/table/utilities.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-DQRamRz3.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
3
|
import { AcceptedColumnTypes } from '../column/constants.cjs';
|
|
4
|
-
import { T as Table, D as DatabaseDefinition } from '../index-
|
|
4
|
+
import { T as Table, D as DatabaseDefinition } from '../index-CY-nPZED.cjs';
|
|
5
5
|
import { Dialect } from '../table/constants.cjs';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../query/constants.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-DQRamRz3.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition } from '../index-
|
|
3
|
+
import { T as Table, D as DatabaseDefinition } from '../index-CY-nPZED.cjs';
|
|
4
4
|
import { Dialect } from '../table/constants.cjs';
|
|
5
5
|
import 'bun';
|
|
6
6
|
import '../query/constants.cjs';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-
|
|
1
|
+
export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-DQRamRz3.cjs';
|
|
2
2
|
import '../column/index.cjs';
|
|
3
3
|
import '../column/constants.cjs';
|
|
4
|
-
import '../index-
|
|
4
|
+
import '../index-CY-nPZED.cjs';
|
|
5
5
|
import '../table/constants.cjs';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../query/constants.cjs';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.cjs';
|
|
3
|
-
import '../index-
|
|
3
|
+
import '../index-CY-nPZED.cjs';
|
|
4
4
|
import '../query/constants.cjs';
|
|
5
5
|
import '../table/constants.cjs';
|
|
6
|
-
export { D as Database } from '../index-
|
|
6
|
+
export { D as Database } from '../index-DQRamRz3.cjs';
|
|
7
7
|
import '../column/constants.cjs';
|
|
8
8
|
import '../column/types.cjs';
|
|
9
9
|
import '../types.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-DQRamRz3.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition,
|
|
3
|
+
import { T as Table, D as DatabaseDefinition, c as TimestampOptions, M as MergeTimestampParanoid } from '../index-CY-nPZED.cjs';
|
|
4
4
|
import { Dialect } from '../table/constants.cjs';
|
|
5
5
|
import 'bun';
|
|
6
6
|
import '../query/constants.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.cjs';
|
|
3
|
-
export { D as DatabaseDefinition,
|
|
3
|
+
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-CY-nPZED.cjs';
|
|
4
4
|
import '../table/constants.cjs';
|
|
5
5
|
import '../column/constants.cjs';
|
|
6
6
|
import '../column/types.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SQL, TransactionSQL } from 'bun';
|
|
2
2
|
import { Dialect } from '../table/constants.cjs';
|
|
3
|
-
import {
|
|
3
|
+
import { S as SqlConfigMapping, d as DatabaseDialect, e as DatabaseExecOptions, P as PostgresConfig, f as MysqlConfig, g as SqliteConfig } from '../index-CY-nPZED.cjs';
|
|
4
4
|
import '../column/index.cjs';
|
|
5
5
|
import '../column/constants.cjs';
|
|
6
6
|
import '../column/types.cjs';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Column } from './column/index.
|
|
1
|
+
import { Column } from './column/index.cjs';
|
|
2
2
|
import { TransactionSQL } from 'bun';
|
|
3
|
-
import { UnionToIntersection, Multiply, Subtract } from './types.
|
|
4
|
-
import { QueryType, OrderBy, AggregationFunction, ExplainClause, ExplainFormat, AcceptedOperator, QueryHooksType, ConditionClause, LogicalOperator, AstType, AcceptedJoin } from './query/constants.
|
|
5
|
-
import { AcceptedColumnTypes } from './column/constants.
|
|
6
|
-
import { Dialect } from './table/constants.
|
|
3
|
+
import { UnionToIntersection, Multiply, Subtract } from './types.cjs';
|
|
4
|
+
import { QueryType, OrderBy, AggregationFunction, ExplainClause, ExplainFormat, AcceptedOperator, QueryHooksType, ConditionClause, LogicalOperator, AstType, AcceptedJoin } from './query/constants.cjs';
|
|
5
|
+
import { AcceptedColumnTypes } from './column/constants.cjs';
|
|
6
|
+
import { Dialect } from './table/constants.cjs';
|
|
7
7
|
|
|
8
8
|
type ColumnSelector<Alias extends string, TableRef extends Table<string, Record<string, Column>>, JoinedTables extends Record<string, Table<string, Record<string, Column>>>> = `${Alias}."${keyof TableRef['columns'] & string}"` | `${Alias}.*` | {
|
|
9
9
|
[A in keyof JoinedTables]: `${A & string}."${keyof JoinedTables[A]['columns'] & string}"` | `${A & string}.*`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TransactionSQL } from 'bun';
|
|
2
2
|
import { Column } from './column/index.cjs';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition,
|
|
3
|
+
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-CY-nPZED.cjs';
|
|
4
4
|
import { QueryHooksType } from './query/constants.cjs';
|
|
5
5
|
import { Dialect } from './table/constants.cjs';
|
|
6
6
|
import { AcceptedColumnTypes } from './column/constants.cjs';
|
package/dist/cjs/index.d.cts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { Column } from './column/index.cjs';
|
|
2
|
-
export { D as Database } from './index-
|
|
2
|
+
export { D as Database } from './index-DQRamRz3.cjs';
|
|
3
3
|
export { Migration } from './migration/index.cjs';
|
|
4
|
-
export {
|
|
4
|
+
export { i as QueryBuilder, T as Table } from './index-CY-nPZED.cjs';
|
|
5
5
|
import './table/constants.cjs';
|
|
6
6
|
import './column/constants.cjs';
|
|
7
7
|
import './column/types.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Column } from '../column/index.cjs';
|
|
2
|
-
import { D as Database } from '../index-
|
|
3
|
-
import { T as Table } from '../index-
|
|
2
|
+
import { D as Database } from '../index-DQRamRz3.cjs';
|
|
3
|
+
import { T as Table } from '../index-CY-nPZED.cjs';
|
|
4
4
|
import { Dialect } from '../table/constants.cjs';
|
|
5
5
|
import { MigrationOptions, MigrationFn } from './type.cjs';
|
|
6
6
|
import '../column/constants.cjs';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Column } from '../column/index.cjs';
|
|
2
|
-
import { D as Database } from '../index-
|
|
3
|
-
import { T as Table } from '../index-
|
|
2
|
+
import { D as Database } from '../index-DQRamRz3.cjs';
|
|
3
|
+
import { T as Table } from '../index-CY-nPZED.cjs';
|
|
4
4
|
import { Dialect } from '../table/constants.cjs';
|
|
5
5
|
import '../column/constants.cjs';
|
|
6
6
|
import '../column/types.cjs';
|
package/dist/cjs/query/ast.d.cts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import '../column/index.cjs';
|
|
2
|
-
export {
|
|
2
|
+
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-CY-nPZED.cjs';
|
|
3
3
|
import './constants.cjs';
|
|
4
4
|
import '../table/constants.cjs';
|
|
5
5
|
import '../column/constants.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder } from '../index-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.cjs';
|
|
@@ -45,7 +45,7 @@ function buildInsertQuery(q, params) {
|
|
|
45
45
|
(row) => keys.map((key) => row[key])
|
|
46
46
|
)
|
|
47
47
|
);
|
|
48
|
-
return `INSERT INTO ${q.table.name} (${columns}) VALUES ${placeholders}
|
|
48
|
+
return `INSERT INTO ${q.table.name} (${columns}) VALUES ${placeholders}`;
|
|
49
49
|
}
|
|
50
50
|
function buildUpdateQuery(q, params) {
|
|
51
51
|
if (!q.definition?.updateValues) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Dialect } from '../table/constants.cjs';
|
|
2
|
-
import {
|
|
2
|
+
import { m as AstNode, J as JoinNode } from '../index-CY-nPZED.cjs';
|
|
3
3
|
import '../column/index.cjs';
|
|
4
4
|
import '../column/constants.cjs';
|
|
5
5
|
import '../column/types.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../../column/index.cjs';
|
|
3
3
|
import { AcceptedOperator } from '../constants.cjs';
|
|
4
4
|
import 'bun';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { having, or, orGroup, where, whereGroup } from './common.cjs';
|
|
2
|
-
export { a as addCondition, b as addGroupCondition } from '../../index-
|
|
2
|
+
export { a as addCondition, b as addGroupCondition } from '../../index-CY-nPZED.cjs';
|
|
3
3
|
export { havingNot, orNot, orNotGroup, whereNot, whereNotGroup } from './not.cjs';
|
|
4
4
|
import '../../column/index.cjs';
|
|
5
5
|
import '../../table/constants.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../../column/index.cjs';
|
|
3
3
|
import { AcceptedOperator } from '../constants.cjs';
|
|
4
4
|
import 'bun';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'bun';
|
|
2
|
-
export {
|
|
2
|
+
export { l as QueryConditionContract, k as QueryTransformerContract } from '../index-CY-nPZED.cjs';
|
|
3
3
|
import '../column/index.cjs';
|
|
4
4
|
import '../table/constants.cjs';
|
|
5
5
|
import './constants.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, E as ExplainOptions } from '../index-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
3
|
import { AcceptedJoin } from './constants.cjs';
|
|
4
4
|
import 'bun';
|
package/dist/cjs/query/sql.d.cts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TransactionSQL } from 'bun';
|
|
2
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
2
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, E as ExplainOptions } from '../index-CY-nPZED.cjs';
|
|
3
3
|
import { Column } from '../column/index.cjs';
|
|
4
4
|
import { Dialect } from '../table/constants.cjs';
|
|
5
5
|
import '../types.cjs';
|
package/dist/cjs/query/sql.js
CHANGED
|
@@ -130,15 +130,24 @@ async function exec(tx) {
|
|
|
130
130
|
});
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
|
-
let result =
|
|
133
|
+
let result = [];
|
|
134
|
+
let mySqlResult = [];
|
|
135
|
+
if (isMySQL && isDelete) {
|
|
136
|
+
const query2 = this.clone().select(`${this.table.name}.*`);
|
|
137
|
+
mySqlResult = await client.exec({
|
|
138
|
+
sql: query2.toQuery().query,
|
|
139
|
+
params,
|
|
140
|
+
tx
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
result = await client.exec({
|
|
134
144
|
sql: query,
|
|
135
145
|
params,
|
|
136
146
|
tx
|
|
137
147
|
});
|
|
138
|
-
if (isMySQL &&
|
|
139
|
-
const query2 = this.clone();
|
|
140
|
-
|
|
141
|
-
result = await client.exec({
|
|
148
|
+
if (isMySQL && isUpdate) {
|
|
149
|
+
const query2 = this.clone().select(`${this.table.name}.*`);
|
|
150
|
+
mySqlResult = await client.exec({
|
|
142
151
|
sql: query2.toQuery().query,
|
|
143
152
|
params,
|
|
144
153
|
tx
|
|
@@ -154,7 +163,7 @@ async function exec(tx) {
|
|
|
154
163
|
});
|
|
155
164
|
}
|
|
156
165
|
}
|
|
157
|
-
return result.map(
|
|
166
|
+
return (isMySQL && isReturning ? mySqlResult : result).map(
|
|
158
167
|
(r) => utilities.parseAliasedRow({
|
|
159
168
|
row: r,
|
|
160
169
|
selects: this.definition.select ?? [],
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.cjs';
|
|
3
3
|
import '../column/constants.cjs';
|
|
4
|
-
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,
|
|
4
|
+
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-CY-nPZED.cjs';
|
|
5
5
|
import '../types.cjs';
|
|
6
6
|
import './constants.cjs';
|
|
7
7
|
import '../table/constants.cjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, h as StrictColumnSelector, i as QueryBuilder, A as AliasedColumn, j as SelectableColumn } from '../index-CY-nPZED.cjs';
|
|
2
2
|
import { Column } from '../column/index.cjs';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.cjs';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'bun';
|
|
2
|
-
export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput,
|
|
2
|
+
export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput, c as TimestampOptions } from '../index-CY-nPZED.cjs';
|
|
3
3
|
import '../column/index.cjs';
|
|
4
4
|
import './constants.cjs';
|
|
5
5
|
import '../types.cjs';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import '../column/constants.cjs';
|
|
2
2
|
import '../column/index.cjs';
|
|
3
3
|
import './constants.cjs';
|
|
4
|
-
export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-
|
|
4
|
+
export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-CY-nPZED.cjs';
|
|
5
5
|
import '../column/types.cjs';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../types.cjs';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-BWg1JZRt.js';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
3
|
import { AcceptedColumnTypes } from '../column/constants.js';
|
|
4
|
-
import { T as Table, D as DatabaseDefinition } from '../index-
|
|
4
|
+
import { T as Table, D as DatabaseDefinition } from '../index-CsVPGz2o.js';
|
|
5
5
|
import { Dialect } from '../table/constants.js';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../query/constants.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-BWg1JZRt.js';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition } from '../index-
|
|
3
|
+
import { T as Table, D as DatabaseDefinition } from '../index-CsVPGz2o.js';
|
|
4
4
|
import { Dialect } from '../table/constants.js';
|
|
5
5
|
import 'bun';
|
|
6
6
|
import '../query/constants.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-
|
|
1
|
+
export { C as ColumnAlterationContract, T as TableAlterationContract } from '../index-BWg1JZRt.js';
|
|
2
2
|
import '../column/index.js';
|
|
3
3
|
import '../column/constants.js';
|
|
4
|
-
import '../index-
|
|
4
|
+
import '../index-CsVPGz2o.js';
|
|
5
5
|
import '../table/constants.js';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../query/constants.js';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.js';
|
|
3
|
-
import '../index-
|
|
3
|
+
import '../index-CsVPGz2o.js';
|
|
4
4
|
import '../query/constants.js';
|
|
5
5
|
import '../table/constants.js';
|
|
6
|
-
export { D as Database } from '../index-
|
|
6
|
+
export { D as Database } from '../index-BWg1JZRt.js';
|
|
7
7
|
import '../column/constants.js';
|
|
8
8
|
import '../column/types.js';
|
|
9
9
|
import '../types.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { D as Database } from '../index-
|
|
1
|
+
import { D as Database } from '../index-BWg1JZRt.js';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition,
|
|
3
|
+
import { T as Table, D as DatabaseDefinition, h as TimestampOptions, M as MergeTimestampParanoid } from '../index-CsVPGz2o.js';
|
|
4
4
|
import { Dialect } from '../table/constants.js';
|
|
5
5
|
import 'bun';
|
|
6
6
|
import '../query/constants.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.js';
|
|
3
|
-
export { D as DatabaseDefinition,
|
|
3
|
+
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';
|
|
4
4
|
import '../table/constants.js';
|
|
5
5
|
import '../column/constants.js';
|
|
6
6
|
import '../column/types.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SQL, TransactionSQL } from 'bun';
|
|
2
2
|
import { Dialect } from '../table/constants.js';
|
|
3
|
-
import {
|
|
3
|
+
import { i as SqlConfigMapping, j as DatabaseDialect, k as DatabaseExecOptions, P as PostgresConfig, l as MysqlConfig, m as SqliteConfig } from '../index-CsVPGz2o.js';
|
|
4
4
|
import '../column/index.js';
|
|
5
5
|
import '../column/constants.js';
|
|
6
6
|
import '../column/types.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TransactionSQL } from 'bun';
|
|
2
2
|
import { Column } from './column/index.js';
|
|
3
|
-
import { T as Table, D as DatabaseDefinition,
|
|
3
|
+
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';
|
|
4
4
|
import { QueryHooksType } from './query/constants.js';
|
|
5
5
|
import { Dialect } from './table/constants.js';
|
|
6
6
|
import { AcceptedColumnTypes } from './column/constants.js';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Column } from './column/index.
|
|
1
|
+
import { Column } from './column/index.js';
|
|
2
2
|
import { TransactionSQL } from 'bun';
|
|
3
|
-
import { UnionToIntersection, Multiply, Subtract } from './types.
|
|
4
|
-
import { QueryType, OrderBy, AggregationFunction, ExplainClause, ExplainFormat, AcceptedOperator, QueryHooksType, ConditionClause, LogicalOperator, AstType, AcceptedJoin } from './query/constants.
|
|
5
|
-
import { AcceptedColumnTypes } from './column/constants.
|
|
6
|
-
import { Dialect } from './table/constants.
|
|
3
|
+
import { UnionToIntersection, Multiply, Subtract } from './types.js';
|
|
4
|
+
import { QueryType, OrderBy, AggregationFunction, ExplainClause, ExplainFormat, AcceptedOperator, QueryHooksType, ConditionClause, LogicalOperator, AstType, AcceptedJoin } from './query/constants.js';
|
|
5
|
+
import { AcceptedColumnTypes } from './column/constants.js';
|
|
6
|
+
import { Dialect } from './table/constants.js';
|
|
7
7
|
|
|
8
8
|
type ColumnSelector<Alias extends string, TableRef extends Table<string, Record<string, Column>>, JoinedTables extends Record<string, Table<string, Record<string, Column>>>> = `${Alias}."${keyof TableRef['columns'] & string}"` | `${Alias}.*` | {
|
|
9
9
|
[A in keyof JoinedTables]: `${A & string}."${keyof JoinedTables[A]['columns'] & string}"` | `${A & string}.*`;
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { Column } from './column/index.js';
|
|
2
|
-
export { D as Database } from './index-
|
|
2
|
+
export { D as Database } from './index-BWg1JZRt.js';
|
|
3
3
|
export { Migration } from './migration/index.js';
|
|
4
|
-
export {
|
|
4
|
+
export { c as QueryBuilder, T as Table } from './index-CsVPGz2o.js';
|
|
5
5
|
import './table/constants.js';
|
|
6
6
|
import './column/constants.js';
|
|
7
7
|
import './column/types.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Column } from '../column/index.js';
|
|
2
|
-
import { D as Database } from '../index-
|
|
3
|
-
import { T as Table } from '../index-
|
|
2
|
+
import { D as Database } from '../index-BWg1JZRt.js';
|
|
3
|
+
import { T as Table } from '../index-CsVPGz2o.js';
|
|
4
4
|
import { Dialect } from '../table/constants.js';
|
|
5
5
|
import { MigrationOptions, MigrationFn } from './type.js';
|
|
6
6
|
import '../column/constants.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Column } from '../column/index.js';
|
|
2
|
-
import { D as Database } from '../index-
|
|
3
|
-
import { T as Table } from '../index-
|
|
2
|
+
import { D as Database } from '../index-BWg1JZRt.js';
|
|
3
|
+
import { T as Table } from '../index-CsVPGz2o.js';
|
|
4
4
|
import { Dialect } from '../table/constants.js';
|
|
5
5
|
import '../column/constants.js';
|
|
6
6
|
import '../column/types.js';
|
package/dist/esm/query/ast.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import '../column/index.js';
|
|
2
|
-
export {
|
|
2
|
+
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';
|
|
3
3
|
import './constants.js';
|
|
4
4
|
import '../table/constants.js';
|
|
5
5
|
import '../column/constants.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder } from '../index-CsVPGz2o.js';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.js';
|
|
@@ -44,7 +44,7 @@ function buildInsertQuery(q, params) {
|
|
|
44
44
|
(row) => keys.map((key) => row[key])
|
|
45
45
|
)
|
|
46
46
|
);
|
|
47
|
-
return `INSERT INTO ${q.table.name} (${columns}) VALUES ${placeholders}
|
|
47
|
+
return `INSERT INTO ${q.table.name} (${columns}) VALUES ${placeholders}`;
|
|
48
48
|
}
|
|
49
49
|
function buildUpdateQuery(q, params) {
|
|
50
50
|
if (!q.definition?.updateValues) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Dialect } from '../table/constants.js';
|
|
2
|
-
import {
|
|
2
|
+
import { g as AstNode, J as JoinNode } from '../index-CsVPGz2o.js';
|
|
3
3
|
import '../column/index.js';
|
|
4
4
|
import '../column/constants.js';
|
|
5
5
|
import '../column/types.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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';
|
|
2
2
|
import { Column } from '../../column/index.js';
|
|
3
3
|
import { AcceptedOperator } from '../constants.js';
|
|
4
4
|
import 'bun';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { having, or, orGroup, where, whereGroup } from './common.js';
|
|
2
|
-
export { a as addCondition, b as addGroupCondition } from '../../index-
|
|
2
|
+
export { a as addCondition, b as addGroupCondition } from '../../index-CsVPGz2o.js';
|
|
3
3
|
export { havingNot, orNot, orNotGroup, whereNot, whereNotGroup } from './not.js';
|
|
4
4
|
import '../../column/index.js';
|
|
5
5
|
import '../../table/constants.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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';
|
|
2
2
|
import { Column } from '../../column/index.js';
|
|
3
3
|
import { AcceptedOperator } from '../constants.js';
|
|
4
4
|
import 'bun';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'bun';
|
|
2
|
-
export {
|
|
2
|
+
export { f as QueryConditionContract, e as QueryTransformerContract } from '../index-CsVPGz2o.js';
|
|
3
3
|
import '../column/index.js';
|
|
4
4
|
import '../table/constants.js';
|
|
5
5
|
import './constants.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, E as ExplainOptions } from '../index-CsVPGz2o.js';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.js';
|
package/dist/esm/query/join.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
3
|
import { AcceptedJoin } from './constants.js';
|
|
4
4
|
import 'bun';
|
package/dist/esm/query/sql.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TransactionSQL } from 'bun';
|
|
2
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
2
|
+
import { T as Table, Q as QueryDefinition, C as ColumnSelector, S as StrictColumnSelector, c as QueryBuilder, E as ExplainOptions } from '../index-CsVPGz2o.js';
|
|
3
3
|
import { Column } from '../column/index.js';
|
|
4
4
|
import { Dialect } from '../table/constants.js';
|
|
5
5
|
import '../types.js';
|
package/dist/esm/query/sql.js
CHANGED
|
@@ -129,15 +129,24 @@ async function exec(tx) {
|
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
let result =
|
|
132
|
+
let result = [];
|
|
133
|
+
let mySqlResult = [];
|
|
134
|
+
if (isMySQL && isDelete) {
|
|
135
|
+
const query2 = this.clone().select(`${this.table.name}.*`);
|
|
136
|
+
mySqlResult = await client.exec({
|
|
137
|
+
sql: query2.toQuery().query,
|
|
138
|
+
params,
|
|
139
|
+
tx
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
result = await client.exec({
|
|
133
143
|
sql: query,
|
|
134
144
|
params,
|
|
135
145
|
tx
|
|
136
146
|
});
|
|
137
|
-
if (isMySQL &&
|
|
138
|
-
const query2 = this.clone();
|
|
139
|
-
|
|
140
|
-
result = await client.exec({
|
|
147
|
+
if (isMySQL && isUpdate) {
|
|
148
|
+
const query2 = this.clone().select(`${this.table.name}.*`);
|
|
149
|
+
mySqlResult = await client.exec({
|
|
141
150
|
sql: query2.toQuery().query,
|
|
142
151
|
params,
|
|
143
152
|
tx
|
|
@@ -153,7 +162,7 @@ async function exec(tx) {
|
|
|
153
162
|
});
|
|
154
163
|
}
|
|
155
164
|
}
|
|
156
|
-
return result.map(
|
|
165
|
+
return (isMySQL && isReturning ? mySqlResult : result).map(
|
|
157
166
|
(r) => parseAliasedRow({
|
|
158
167
|
row: r,
|
|
159
168
|
selects: this.definition.select ?? [],
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import 'bun';
|
|
2
2
|
import '../column/index.js';
|
|
3
3
|
import '../column/constants.js';
|
|
4
|
-
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,
|
|
4
|
+
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';
|
|
5
5
|
import '../types.js';
|
|
6
6
|
import './constants.js';
|
|
7
7
|
import '../table/constants.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as Table, Q as QueryDefinition, C as ColumnSelector,
|
|
1
|
+
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';
|
|
2
2
|
import { Column } from '../column/index.js';
|
|
3
3
|
import 'bun';
|
|
4
4
|
import '../types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'bun';
|
|
2
|
-
export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput,
|
|
2
|
+
export { K as ExecOptions, M as MergeTimestampParanoid, H as TableOptions, I as TableOutput, h as TimestampOptions } from '../index-CsVPGz2o.js';
|
|
3
3
|
import '../column/index.js';
|
|
4
4
|
import './constants.js';
|
|
5
5
|
import '../types.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import '../column/constants.js';
|
|
2
2
|
import '../column/index.js';
|
|
3
3
|
import './constants.js';
|
|
4
|
-
export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-
|
|
4
|
+
export { y as createdAt, F as defineColumns, B as deletedAt, z as updatedAt } from '../index-CsVPGz2o.js';
|
|
5
5
|
import '../column/types.js';
|
|
6
6
|
import 'bun';
|
|
7
7
|
import '../types.js';
|