pqb 0.7.0 → 0.7.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/CHANGELOG.md +12 -0
- package/dist/index.d.ts +45 -9
- package/dist/index.esm.js +73 -6
- package/dist/index.esm.js.map +1 -1
- package/dist/index.js +73 -6
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/adapter.test.ts +1 -1
- package/src/columnSchema/columnType.test.ts +2 -1
- package/src/columnSchema/columnTypes.test.ts +1 -1
- package/src/columnSchema/timestamps.test.ts +2 -2
- package/src/columnSchema/utils.ts +1 -1
- package/src/columnsOperators.test.ts +1 -1
- package/src/db.test.ts +83 -1
- package/src/db.ts +27 -10
- package/src/errors.test.ts +6 -1
- package/src/queryMethods/aggregate.test.ts +1 -1
- package/src/queryMethods/callbacks.test.ts +1 -1
- package/src/queryMethods/clear.test.ts +1 -1
- package/src/queryMethods/columnInfo.test.ts +5 -1
- package/src/queryMethods/copy.test.ts +63 -0
- package/src/queryMethods/copy.ts +17 -0
- package/src/queryMethods/create.test.ts +1 -1
- package/src/queryMethods/delete.test.ts +1 -1
- package/src/queryMethods/for.test.ts +5 -1
- package/src/queryMethods/from.test.ts +6 -1
- package/src/queryMethods/get.test.ts +7 -1
- package/src/queryMethods/having.test.ts +6 -1
- package/src/queryMethods/join.test.ts +6 -1
- package/src/queryMethods/json.test.ts +1 -1
- package/src/queryMethods/log.test.ts +6 -1
- package/src/queryMethods/log.ts +1 -0
- package/src/queryMethods/merge.test.ts +1 -1
- package/src/queryMethods/queryMethods.test.ts +1 -1
- package/src/queryMethods/queryMethods.ts +4 -1
- package/src/queryMethods/raw.test.ts +1 -1
- package/src/queryMethods/select.test.ts +1 -1
- package/src/queryMethods/then.test.ts +6 -1
- package/src/queryMethods/transaction.test.ts +1 -1
- package/src/queryMethods/union.test.ts +1 -1
- package/src/queryMethods/update.test.ts +1 -1
- package/src/queryMethods/upsert.test.ts +6 -1
- package/src/queryMethods/where.test.ts +1 -1
- package/src/queryMethods/window.test.ts +1 -1
- package/src/queryMethods/with.test.ts +6 -1
- package/src/sql/copy.ts +59 -0
- package/src/sql/data.ts +29 -1
- package/src/sql/toSql.ts +6 -0
- package/src/{test-utils.ts → test-utils/test-utils.ts} +8 -7
- package/src/test-utils/user.csv +1 -0
- package/src/utils.test.ts +1 -1
package/src/sql/copy.ts
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { ToSqlCtx } from './toSql';
|
|
2
|
+
import { CopyQueryData } from './data';
|
|
3
|
+
import { Query } from '../query';
|
|
4
|
+
import { q } from './common';
|
|
5
|
+
import { quote } from '../quote';
|
|
6
|
+
import { pushWhereStatementSql } from './where';
|
|
7
|
+
|
|
8
|
+
export const pushCopySql = (
|
|
9
|
+
ctx: ToSqlCtx,
|
|
10
|
+
model: Query,
|
|
11
|
+
query: CopyQueryData,
|
|
12
|
+
quotedAs?: string,
|
|
13
|
+
) => {
|
|
14
|
+
const { sql } = ctx;
|
|
15
|
+
const { copy } = query;
|
|
16
|
+
|
|
17
|
+
const columns = copy.columns ? `(${copy.columns.map(q).join(', ')})` : '';
|
|
18
|
+
|
|
19
|
+
const target = 'from' in copy ? copy.from : copy.to;
|
|
20
|
+
|
|
21
|
+
sql.push(
|
|
22
|
+
`COPY ${q(model.table as string)}${columns} ${
|
|
23
|
+
'from' in copy ? 'FROM' : 'TO'
|
|
24
|
+
} ${
|
|
25
|
+
typeof target === 'string'
|
|
26
|
+
? quote(target)
|
|
27
|
+
: `PROGRAM ${quote(target.program)}`
|
|
28
|
+
}`,
|
|
29
|
+
);
|
|
30
|
+
|
|
31
|
+
if (Object.keys(copy).length > (copy.columns ? 2 : 1)) {
|
|
32
|
+
const options: string[] = [];
|
|
33
|
+
|
|
34
|
+
if (copy.format) options.push(`FORMAT ${copy.format}`);
|
|
35
|
+
if (copy.freeze) options.push(`FREEZE ${copy.freeze}`);
|
|
36
|
+
if (copy.delimiter) options.push(`DELIMITER ${quote(copy.delimiter)}`);
|
|
37
|
+
if (copy.null) options.push(`NULL ${quote(copy.null)}`);
|
|
38
|
+
if (copy.header) options.push(`HEADER ${copy.header}`);
|
|
39
|
+
if (copy.quote) options.push(`QUOTE ${quote(copy.quote)}`);
|
|
40
|
+
if (copy.escape) options.push(`ESCAPE ${quote(copy.escape)}`);
|
|
41
|
+
if (copy.forceQuote)
|
|
42
|
+
options.push(
|
|
43
|
+
`FORCE_QUOTE ${
|
|
44
|
+
copy.forceQuote === '*'
|
|
45
|
+
? '*'
|
|
46
|
+
: `(${copy.forceQuote.map(q).join(', ')})`
|
|
47
|
+
}`,
|
|
48
|
+
);
|
|
49
|
+
if (copy.forceNotNull)
|
|
50
|
+
options.push(`FORCE_NOT_NULL (${copy.forceNotNull.map(q).join(', ')})`);
|
|
51
|
+
if (copy.forceNull)
|
|
52
|
+
options.push(`FORCE_NULL (${copy.forceNull.map(q).join(', ')})`);
|
|
53
|
+
if (copy.encoding) options.push(`ENCODING ${quote(copy.encoding)}`);
|
|
54
|
+
|
|
55
|
+
sql.push(`WITH (${options.join(', ')})`);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
pushWhereStatementSql(ctx, model, query, quotedAs);
|
|
59
|
+
};
|
package/src/sql/data.ts
CHANGED
|
@@ -136,13 +136,41 @@ export type ColumnInfoQueryData = CommonQueryData & {
|
|
|
136
136
|
column?: string;
|
|
137
137
|
};
|
|
138
138
|
|
|
139
|
+
export type CopyQueryData = CommonQueryData & {
|
|
140
|
+
type: 'copy';
|
|
141
|
+
copy: CopyOptions;
|
|
142
|
+
};
|
|
143
|
+
|
|
144
|
+
export type CopyOptions<Column = string> = {
|
|
145
|
+
columns?: Column[];
|
|
146
|
+
format?: 'text' | 'csv' | 'binary';
|
|
147
|
+
freeze?: boolean;
|
|
148
|
+
delimiter?: string;
|
|
149
|
+
null?: string;
|
|
150
|
+
header?: boolean | 'match';
|
|
151
|
+
quote?: string;
|
|
152
|
+
escape?: string;
|
|
153
|
+
forceQuote?: Column[] | '*';
|
|
154
|
+
forceNotNull?: Column[];
|
|
155
|
+
forceNull?: Column[];
|
|
156
|
+
encoding?: string;
|
|
157
|
+
} & (
|
|
158
|
+
| {
|
|
159
|
+
from: string | { program: string };
|
|
160
|
+
}
|
|
161
|
+
| {
|
|
162
|
+
to: string | { program: string };
|
|
163
|
+
}
|
|
164
|
+
);
|
|
165
|
+
|
|
139
166
|
export type QueryData =
|
|
140
167
|
| SelectQueryData
|
|
141
168
|
| InsertQueryData
|
|
142
169
|
| UpdateQueryData
|
|
143
170
|
| DeleteQueryData
|
|
144
171
|
| TruncateQueryData
|
|
145
|
-
| ColumnInfoQueryData
|
|
172
|
+
| ColumnInfoQueryData
|
|
173
|
+
| CopyQueryData;
|
|
146
174
|
|
|
147
175
|
export const cloneQueryArrays = (q: QueryData) => {
|
|
148
176
|
if (q.with) q.with = q.with?.slice(0);
|
package/src/sql/toSql.ts
CHANGED
|
@@ -18,6 +18,7 @@ import { pushOrderBySql } from './orderBy';
|
|
|
18
18
|
import { OnQueryBuilder, WhereQueryBuilder } from '../queryMethods';
|
|
19
19
|
import { getRaw, isRaw } from '../common';
|
|
20
20
|
import { QueryData } from './data';
|
|
21
|
+
import { pushCopySql } from './copy';
|
|
21
22
|
|
|
22
23
|
export type ToSqlCtx = {
|
|
23
24
|
whereQueryBuilder: typeof WhereQueryBuilder;
|
|
@@ -91,6 +92,11 @@ export const makeSql = (
|
|
|
91
92
|
pushDeleteSql(ctx, model, query, quotedAs);
|
|
92
93
|
return { text: sql.join(' '), values };
|
|
93
94
|
}
|
|
95
|
+
|
|
96
|
+
if (query.type === 'copy') {
|
|
97
|
+
pushCopySql(ctx, model, query, quotedAs);
|
|
98
|
+
return { text: sql.join(' '), values };
|
|
99
|
+
}
|
|
94
100
|
}
|
|
95
101
|
|
|
96
102
|
const quotedAs = model.table && q(query.as || model.table);
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Query } from '
|
|
2
|
-
import { createDb } from '
|
|
1
|
+
import { Query } from '../query';
|
|
2
|
+
import { createDb } from '../db';
|
|
3
3
|
import {
|
|
4
4
|
patchPgForTransactions,
|
|
5
5
|
rollbackTransaction,
|
|
6
6
|
startTransaction,
|
|
7
7
|
} from 'pg-transactional-tests';
|
|
8
8
|
import { Client } from 'pg';
|
|
9
|
-
import { quote } from '
|
|
10
|
-
import { columnTypes } from '
|
|
11
|
-
import { MaybeArray, toArray } from '
|
|
12
|
-
import { Adapter } from '
|
|
9
|
+
import { quote } from '../quote';
|
|
10
|
+
import { columnTypes } from '../columnSchema';
|
|
11
|
+
import { MaybeArray, toArray } from '../utils';
|
|
12
|
+
import { Adapter } from '../adapter';
|
|
13
13
|
|
|
14
14
|
export const dbOptions = {
|
|
15
15
|
connectionString: process.env.DATABASE_URL,
|
|
@@ -64,7 +64,8 @@ export const Chat = db('chat', (t) => ({
|
|
|
64
64
|
}));
|
|
65
65
|
|
|
66
66
|
export const UniqueTable = db('uniqueTable', (t) => ({
|
|
67
|
-
|
|
67
|
+
id: t.serial().primaryKey(),
|
|
68
|
+
one: t.text().unique().primaryKey(),
|
|
68
69
|
two: t.integer().unique(),
|
|
69
70
|
thirdColumn: t.text(),
|
|
70
71
|
fourthColumn: t.integer(),
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
1,name,password,,,,,,,,
|
package/src/utils.test.ts
CHANGED