kysely 0.23.2 → 0.23.3

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.
@@ -31,7 +31,7 @@ class MysqlIntrospector {
31
31
  ])
32
32
  .where('table_schema', '=', (0, sql_js_1.sql) `database()`)
33
33
  .orderBy('table_name')
34
- .orderBy('column_name')
34
+ .orderBy('ordinal_position')
35
35
  .castTo();
36
36
  if (!options.withInternalKyselyTables) {
37
37
  query = query
@@ -57,7 +57,7 @@ class PostgresIntrospector {
57
57
  .where('a.attisdropped', '!=', true)
58
58
  .orderBy('ns.nspname')
59
59
  .orderBy('c.relname')
60
- .orderBy('a.attname')
60
+ .orderBy('a.attnum')
61
61
  .castTo();
62
62
  if (!options.withInternalKyselyTables) {
63
63
  query = query
@@ -52,7 +52,7 @@ class SqliteIntrospector {
52
52
  const columns = await db
53
53
  .selectFrom((0, sql_js_1.sql) `pragma_table_info(${table})`.as('table_info'))
54
54
  .select(['name', 'type', 'notnull', 'dflt_value'])
55
- .orderBy('name')
55
+ .orderBy('cid')
56
56
  .execute();
57
57
  return {
58
58
  name: table,
@@ -172,7 +172,7 @@ export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.j
172
172
  export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
173
173
  export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
174
174
  export { InsertObject } from './parser/insert-values-parser.js';
175
- export { MutationObject } from './parser/update-set-parser.js';
175
+ export { UpdateObject } from './parser/update-set-parser.js';
176
176
  export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
177
177
  export { ComparisonOperatorExpression, OperandValueExpression, OperandValueExpressionOrList, } from './parser/binary-operation-parser.js';
178
178
  export { ExistsExpression } from './parser/unary-operation-parser.js';
@@ -7,7 +7,7 @@ import { HavingInterface } from '../query-builder/having-interface.js';
7
7
  import { OperationNode } from '../operation-node/operation-node.js';
8
8
  import { Expression } from '../expression/expression.js';
9
9
  export declare type OperandValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
10
- export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
10
+ export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE> | null>;
11
11
  export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
12
12
  export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
13
13
  export declare type ComparisonOperatorExpression = ComparisonOperator | Expression<any>;
@@ -1,7 +1,7 @@
1
1
  import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
2
2
  import { UpdateKeys, UpdateType } from '../util/column-type.js';
3
3
  import { ValueExpression } from './value-parser.js';
4
- export declare type MutationObject<DB, TB extends keyof DB, TM extends keyof DB> = {
5
- [C in UpdateKeys<DB[TM]>]?: ValueExpression<DB, TB, UpdateType<DB[TM][C]>> | undefined;
4
+ export declare type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB> = {
5
+ [C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
6
6
  };
7
- export declare function parseUpdateObject(row: MutationObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
7
+ export declare function parseUpdateObject(update: UpdateObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
@@ -4,8 +4,8 @@ exports.parseUpdateObject = void 0;
4
4
  const column_node_js_1 = require("../operation-node/column-node.js");
5
5
  const column_update_node_js_1 = require("../operation-node/column-update-node.js");
6
6
  const value_parser_js_1 = require("./value-parser.js");
7
- function parseUpdateObject(row) {
8
- return Object.entries(row)
7
+ function parseUpdateObject(update) {
8
+ return Object.entries(update)
9
9
  .filter(([_, value]) => value !== undefined)
10
10
  .map(([key, value]) => {
11
11
  return column_update_node_js_1.ColumnUpdateNode.create(column_node_js_1.ColumnNode.create(key), (0, value_parser_js_1.parseValueExpression)(value));
@@ -4,7 +4,7 @@ import { SelectExpression } from '../parser/select-parser.js';
4
4
  import { InsertObject } from '../parser/insert-values-parser.js';
5
5
  import { InsertQueryNode } from '../operation-node/insert-query-node.js';
6
6
  import { MergePartial, SingleResultType } from '../util/type-utils.js';
7
- import { MutationObject } from '../parser/update-set-parser.js';
7
+ import { UpdateObject } from '../parser/update-set-parser.js';
8
8
  import { Compilable } from '../util/compilable.js';
9
9
  import { QueryExecutor } from '../query-executor/query-executor.js';
10
10
  import { QueryId } from '../util/query-id.js';
@@ -385,7 +385,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
385
385
  * .onDuplicateKeyUpdate({ species: 'hamster' })
386
386
  * ```
387
387
  */
388
- onDuplicateKeyUpdate(updates: MutationObject<DB, TB, TB>): InsertQueryBuilder<DB, TB, O>;
388
+ onDuplicateKeyUpdate(updates: UpdateObject<DB, TB, TB>): InsertQueryBuilder<DB, TB, O>;
389
389
  /**
390
390
  * Allows you to return data from modified rows.
391
391
  *
@@ -4,7 +4,7 @@ import { OperationNodeSource } from '../operation-node/operation-node-source.js'
4
4
  import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
5
5
  import { ExpressionOrFactory } from '../parser/expression-parser.js';
6
6
  import { ReferenceExpression } from '../parser/reference-parser.js';
7
- import { MutationObject } from '../parser/update-set-parser.js';
7
+ import { UpdateObject } from '../parser/update-set-parser.js';
8
8
  import { AnyColumn } from '../util/type-utils.js';
9
9
  import { WhereInterface } from './where-interface.js';
10
10
  export declare class OnConflictBuilder<DB, TB extends keyof DB> implements WhereInterface<DB, TB> {
@@ -406,7 +406,7 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
406
406
  * do update set "first_name" = $3
407
407
  * ```
408
408
  */
409
- doUpdateSet(updates: MutationObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>, OnConflictTables<TB>>): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>;
409
+ doUpdateSet(updates: UpdateObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>, OnConflictTables<TB>>): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>;
410
410
  }
411
411
  export interface OnConflictBuilderProps {
412
412
  readonly onConflictNode: OnConflictNode;
@@ -7,7 +7,7 @@ import { ReturningRow } from '../parser/returning-parser.js';
7
7
  import { ReferenceExpression } from '../parser/reference-parser.js';
8
8
  import { MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
9
9
  import { UpdateQueryNode } from '../operation-node/update-query-node.js';
10
- import { MutationObject } from '../parser/update-set-parser.js';
10
+ import { UpdateObject } from '../parser/update-set-parser.js';
11
11
  import { Compilable } from '../util/compilable.js';
12
12
  import { QueryExecutor } from '../query-executor/query-executor.js';
13
13
  import { QueryId } from '../util/query-id.js';
@@ -670,7 +670,7 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
670
670
  * where "id" = $4
671
671
  * ```
672
672
  */
673
- set(row: MutationObject<DB, TB, UT>): UpdateQueryBuilder<DB, UT, TB, O>;
673
+ set(row: UpdateObject<DB, TB, UT>): UpdateQueryBuilder<DB, UT, TB, O>;
674
674
  /**
675
675
  * Allows you to return data from modified rows.
676
676
  *
@@ -29,7 +29,7 @@ export class MysqlIntrospector {
29
29
  ])
30
30
  .where('table_schema', '=', sql `database()`)
31
31
  .orderBy('table_name')
32
- .orderBy('column_name')
32
+ .orderBy('ordinal_position')
33
33
  .castTo();
34
34
  if (!options.withInternalKyselyTables) {
35
35
  query = query
@@ -55,7 +55,7 @@ export class PostgresIntrospector {
55
55
  .where('a.attisdropped', '!=', true)
56
56
  .orderBy('ns.nspname')
57
57
  .orderBy('c.relname')
58
- .orderBy('a.attname')
58
+ .orderBy('a.attnum')
59
59
  .castTo();
60
60
  if (!options.withInternalKyselyTables) {
61
61
  query = query
@@ -50,7 +50,7 @@ export class SqliteIntrospector {
50
50
  const columns = await db
51
51
  .selectFrom(sql `pragma_table_info(${table})`.as('table_info'))
52
52
  .select(['name', 'type', 'notnull', 'dflt_value'])
53
- .orderBy('name')
53
+ .orderBy('cid')
54
54
  .execute();
55
55
  return {
56
56
  name: table,
@@ -172,7 +172,7 @@ export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.j
172
172
  export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
173
173
  export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
174
174
  export { InsertObject } from './parser/insert-values-parser.js';
175
- export { MutationObject } from './parser/update-set-parser.js';
175
+ export { UpdateObject } from './parser/update-set-parser.js';
176
176
  export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
177
177
  export { ComparisonOperatorExpression, OperandValueExpression, OperandValueExpressionOrList, } from './parser/binary-operation-parser.js';
178
178
  export { ExistsExpression } from './parser/unary-operation-parser.js';
@@ -7,7 +7,7 @@ import { HavingInterface } from '../query-builder/having-interface.js';
7
7
  import { OperationNode } from '../operation-node/operation-node.js';
8
8
  import { Expression } from '../expression/expression.js';
9
9
  export declare type OperandValueExpression<DB, TB extends keyof DB, RE> = ValueExpression<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
10
- export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE>>;
10
+ export declare type OperandValueExpressionOrList<DB, TB extends keyof DB, RE> = ValueExpressionOrList<DB, TB, ExtractTypeFromReferenceExpression<DB, TB, RE> | null>;
11
11
  export declare type WhereGrouper<DB, TB extends keyof DB> = (qb: WhereInterface<DB, TB>) => WhereInterface<DB, TB>;
12
12
  export declare type HavingGrouper<DB, TB extends keyof DB> = (qb: HavingInterface<DB, TB>) => HavingInterface<DB, TB>;
13
13
  export declare type ComparisonOperatorExpression = ComparisonOperator | Expression<any>;
@@ -1,7 +1,7 @@
1
1
  import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
2
2
  import { UpdateKeys, UpdateType } from '../util/column-type.js';
3
3
  import { ValueExpression } from './value-parser.js';
4
- export declare type MutationObject<DB, TB extends keyof DB, TM extends keyof DB> = {
5
- [C in UpdateKeys<DB[TM]>]?: ValueExpression<DB, TB, UpdateType<DB[TM][C]>> | undefined;
4
+ export declare type UpdateObject<DB, TB extends keyof DB, UT extends keyof DB> = {
5
+ [C in UpdateKeys<DB[UT]>]?: ValueExpression<DB, TB, UpdateType<DB[UT][C]>> | undefined;
6
6
  };
7
- export declare function parseUpdateObject(row: MutationObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
7
+ export declare function parseUpdateObject(update: UpdateObject<any, any, any>): ReadonlyArray<ColumnUpdateNode>;
@@ -2,8 +2,8 @@
2
2
  import { ColumnNode } from '../operation-node/column-node.js';
3
3
  import { ColumnUpdateNode } from '../operation-node/column-update-node.js';
4
4
  import { parseValueExpression } from './value-parser.js';
5
- export function parseUpdateObject(row) {
6
- return Object.entries(row)
5
+ export function parseUpdateObject(update) {
6
+ return Object.entries(update)
7
7
  .filter(([_, value]) => value !== undefined)
8
8
  .map(([key, value]) => {
9
9
  return ColumnUpdateNode.create(ColumnNode.create(key), parseValueExpression(value));
@@ -4,7 +4,7 @@ import { SelectExpression } from '../parser/select-parser.js';
4
4
  import { InsertObject } from '../parser/insert-values-parser.js';
5
5
  import { InsertQueryNode } from '../operation-node/insert-query-node.js';
6
6
  import { MergePartial, SingleResultType } from '../util/type-utils.js';
7
- import { MutationObject } from '../parser/update-set-parser.js';
7
+ import { UpdateObject } from '../parser/update-set-parser.js';
8
8
  import { Compilable } from '../util/compilable.js';
9
9
  import { QueryExecutor } from '../query-executor/query-executor.js';
10
10
  import { QueryId } from '../util/query-id.js';
@@ -385,7 +385,7 @@ export declare class InsertQueryBuilder<DB, TB extends keyof DB, O> implements R
385
385
  * .onDuplicateKeyUpdate({ species: 'hamster' })
386
386
  * ```
387
387
  */
388
- onDuplicateKeyUpdate(updates: MutationObject<DB, TB, TB>): InsertQueryBuilder<DB, TB, O>;
388
+ onDuplicateKeyUpdate(updates: UpdateObject<DB, TB, TB>): InsertQueryBuilder<DB, TB, O>;
389
389
  /**
390
390
  * Allows you to return data from modified rows.
391
391
  *
@@ -4,7 +4,7 @@ import { OperationNodeSource } from '../operation-node/operation-node-source.js'
4
4
  import { ComparisonOperatorExpression, OperandValueExpressionOrList, WhereGrouper } from '../parser/binary-operation-parser.js';
5
5
  import { ExpressionOrFactory } from '../parser/expression-parser.js';
6
6
  import { ReferenceExpression } from '../parser/reference-parser.js';
7
- import { MutationObject } from '../parser/update-set-parser.js';
7
+ import { UpdateObject } from '../parser/update-set-parser.js';
8
8
  import { AnyColumn } from '../util/type-utils.js';
9
9
  import { WhereInterface } from './where-interface.js';
10
10
  export declare class OnConflictBuilder<DB, TB extends keyof DB> implements WhereInterface<DB, TB> {
@@ -406,7 +406,7 @@ export declare class OnConflictBuilder<DB, TB extends keyof DB> implements Where
406
406
  * do update set "first_name" = $3
407
407
  * ```
408
408
  */
409
- doUpdateSet(updates: MutationObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>, OnConflictTables<TB>>): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>;
409
+ doUpdateSet(updates: UpdateObject<OnConflictDatabase<DB, TB>, OnConflictTables<TB>, OnConflictTables<TB>>): OnConflictUpdateBuilder<OnConflictDatabase<DB, TB>, OnConflictTables<TB>>;
410
410
  }
411
411
  export interface OnConflictBuilderProps {
412
412
  readonly onConflictNode: OnConflictNode;
@@ -7,7 +7,7 @@ import { ReturningRow } from '../parser/returning-parser.js';
7
7
  import { ReferenceExpression } from '../parser/reference-parser.js';
8
8
  import { MergePartial, Nullable, SingleResultType } from '../util/type-utils.js';
9
9
  import { UpdateQueryNode } from '../operation-node/update-query-node.js';
10
- import { MutationObject } from '../parser/update-set-parser.js';
10
+ import { UpdateObject } from '../parser/update-set-parser.js';
11
11
  import { Compilable } from '../util/compilable.js';
12
12
  import { QueryExecutor } from '../query-executor/query-executor.js';
13
13
  import { QueryId } from '../util/query-id.js';
@@ -670,7 +670,7 @@ export declare class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyo
670
670
  * where "id" = $4
671
671
  * ```
672
672
  */
673
- set(row: MutationObject<DB, TB, UT>): UpdateQueryBuilder<DB, UT, TB, O>;
673
+ set(row: UpdateObject<DB, TB, UT>): UpdateQueryBuilder<DB, UT, TB, O>;
674
674
  /**
675
675
  * Allows you to return data from modified rows.
676
676
  *
@@ -4,7 +4,7 @@ import { parseTableExpressionOrList, } from '../parser/table-parser.js';
4
4
  import { parseSelectExpressionOrList, parseSelectAll, } from '../parser/select-parser.js';
5
5
  import { QueryNode } from '../operation-node/query-node.js';
6
6
  import { UpdateQueryNode } from '../operation-node/update-query-node.js';
7
- import { parseUpdateObject, } from '../parser/update-set-parser.js';
7
+ import { parseUpdateObject } from '../parser/update-set-parser.js';
8
8
  import { preventAwait } from '../util/prevent-await.js';
9
9
  import { freeze } from '../util/object-utils.js';
10
10
  import { UpdateResult } from './update-result.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kysely",
3
- "version": "0.23.2",
3
+ "version": "0.23.3",
4
4
  "description": "Type safe SQL query builder",
5
5
  "repository": {
6
6
  "type": "git",