node-firebird-driver-native 3.3.0 → 3.5.0
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/lib/attachment.js +2 -0
- package/dist/lib/attachment.js.map +1 -1
- package/dist/lib/fb-util.js +1 -0
- package/dist/lib/fb-util.js.map +1 -1
- package/dist/lib/statement.d.ts +3 -1
- package/dist/lib/statement.js +9 -0
- package/dist/lib/statement.js.map +1 -1
- package/package.json +4 -4
- package/src/lib/attachment.ts +2 -0
- package/src/lib/fb-util.ts +1 -0
- package/src/lib/statement.ts +14 -2
package/dist/lib/attachment.js
CHANGED
|
@@ -11,6 +11,7 @@ const impl_1 = require("node-firebird-driver/dist/lib/impl");
|
|
|
11
11
|
class AttachmentImpl extends impl_1.AbstractAttachment {
|
|
12
12
|
static async connect(client, uri, options) {
|
|
13
13
|
const attachment = new AttachmentImpl(client);
|
|
14
|
+
attachment.charSetForNONE = options?.charSetForNONE ?? 'utf8';
|
|
14
15
|
return await client.statusAction(async (status) => {
|
|
15
16
|
const dpb = (0, fb_util_1.createDpb)(options);
|
|
16
17
|
attachment.attachmentHandle = await client.dispatcher.attachDatabaseAsync(status, uri, dpb.length, dpb);
|
|
@@ -19,6 +20,7 @@ class AttachmentImpl extends impl_1.AbstractAttachment {
|
|
|
19
20
|
}
|
|
20
21
|
static async createDatabase(client, uri, options) {
|
|
21
22
|
const attachment = new AttachmentImpl(client);
|
|
23
|
+
attachment.charSetForNONE = options?.charSetForNONE ?? 'utf8';
|
|
22
24
|
return await client.statusAction(async (status) => {
|
|
23
25
|
const dpb = (0, fb_util_1.createDpb)(options);
|
|
24
26
|
attachment.attachmentHandle = await client.dispatcher.createDatabaseAsync(status, uri, dpb.length, dpb);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment.js","sourceRoot":"","sources":["../../src/lib/attachment.ts"],"names":[],"mappings":";;;AAAA,iCAAwC;AAExC,2CAA4C;AAC5C,+CAAgD;AAChD,qCAAsC;AACtC,uCAAsC;AAWtC,6DAAoF;AAIpF,iCAAiC;AACjC,MAAa,cAAe,SAAQ,yBAAkB;IAMpD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAkB,EAAE,GAAW,EAAE,OAAwB;QAC5E,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"attachment.js","sourceRoot":"","sources":["../../src/lib/attachment.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/fb-util.js
CHANGED
|
@@ -77,6 +77,7 @@ function createDescriptors(status, metadata) {
|
|
|
77
77
|
ret.push({
|
|
78
78
|
type: metadata.getTypeSync(status, i),
|
|
79
79
|
subType: metadata.getSubTypeSync(status, i),
|
|
80
|
+
charSet: metadata.getCharSetSync(status, i),
|
|
80
81
|
nullOffset: metadata.getNullOffsetSync(status, i),
|
|
81
82
|
offset: metadata.getOffsetSync(status, i),
|
|
82
83
|
length: metadata.getLengthSync(status, i),
|
package/dist/lib/fb-util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fb-util.js","sourceRoot":"","sources":["../../src/lib/fb-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAMA,kCAuDC;AAED,
|
|
1
|
+
{"version":3,"file":"fb-util.js","sourceRoot":"","sources":["../../src/lib/fb-util.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/statement.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AttachmentImpl } from './attachment';
|
|
2
2
|
import { ResultSetImpl } from './resultset';
|
|
3
3
|
import { TransactionImpl } from './transaction';
|
|
4
|
-
import { ExecuteOptions, ExecuteQueryOptions, PrepareOptions } from 'node-firebird-driver';
|
|
4
|
+
import { ExecuteOptions, ExecuteQueryOptions, PrepareOptions, StatementType } from 'node-firebird-driver';
|
|
5
5
|
import { AbstractStatement } from 'node-firebird-driver/dist/lib/impl';
|
|
6
6
|
import { DataReader, DataWriter } from './fb-util';
|
|
7
7
|
import * as fb from 'node-firebird-native-api';
|
|
@@ -16,6 +16,7 @@ export declare class StatementImpl extends AbstractStatement {
|
|
|
16
16
|
outBuffer: Uint8Array;
|
|
17
17
|
dataWriter: DataWriter;
|
|
18
18
|
dataReader: DataReader;
|
|
19
|
+
typePromise?: Promise<StatementType>;
|
|
19
20
|
static prepare(attachment: AttachmentImpl, transaction: TransactionImpl, sqlStmt: string, _options?: PrepareOptions): Promise<StatementImpl>;
|
|
20
21
|
/** Disposes this statement's resources. */
|
|
21
22
|
protected internalDispose(): Promise<void>;
|
|
@@ -28,4 +29,5 @@ export declare class StatementImpl extends AbstractStatement {
|
|
|
28
29
|
setCursorName(cursorName: string): Promise<void>;
|
|
29
30
|
getExecPathText(): Promise<string | undefined>;
|
|
30
31
|
get columnLabels(): Promise<string[]>;
|
|
32
|
+
get type(): Promise<StatementType>;
|
|
31
33
|
}
|
package/dist/lib/statement.js
CHANGED
|
@@ -96,6 +96,15 @@ class StatementImpl extends impl_1.AbstractStatement {
|
|
|
96
96
|
};
|
|
97
97
|
return asyncFunc();
|
|
98
98
|
}
|
|
99
|
+
get type() {
|
|
100
|
+
if (!this.typePromise) {
|
|
101
|
+
const asyncFunc = async () => {
|
|
102
|
+
return await this.attachment.client.statusAction((status) => this.statementHandle.getTypeAsync(status));
|
|
103
|
+
};
|
|
104
|
+
this.typePromise = asyncFunc();
|
|
105
|
+
}
|
|
106
|
+
return this.typePromise;
|
|
107
|
+
}
|
|
99
108
|
}
|
|
100
109
|
exports.StatementImpl = StatementImpl;
|
|
101
110
|
//# sourceMappingURL=statement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statement.js","sourceRoot":"","sources":["../../src/lib/statement.ts"],"names":[],"mappings":";;;AACA,2CAA4C;AAK5C,6DAAsH;AAEtH,uCAAuH;AAEvH,+CAA+C;AAE/C,+BAAmC;AAEnC,gCAAgC;AAChC,MAAa,aAAc,SAAQ,wBAAiB;
|
|
1
|
+
{"version":3,"file":"statement.js","sourceRoot":"","sources":["../../src/lib/statement.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-firebird-driver-native",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0",
|
|
4
4
|
"description": "Firebird Native Driver for Node.js",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
52
|
"@types/node": "^22.13.10",
|
|
53
|
-
"node-firebird-driver": "^3.
|
|
54
|
-
"node-firebird-native-api": "^3.1.
|
|
53
|
+
"node-firebird-driver": "^3.5.0",
|
|
54
|
+
"node-firebird-native-api": "^3.1.5"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "63280ab5947be62f679f22b2548f8b50ad5585e2"
|
|
57
57
|
}
|
package/src/lib/attachment.ts
CHANGED
|
@@ -27,6 +27,7 @@ export class AttachmentImpl extends AbstractAttachment {
|
|
|
27
27
|
|
|
28
28
|
static async connect(client: ClientImpl, uri: string, options?: ConnectOptions): Promise<AttachmentImpl> {
|
|
29
29
|
const attachment = new AttachmentImpl(client);
|
|
30
|
+
attachment.charSetForNONE = options?.charSetForNONE ?? 'utf8';
|
|
30
31
|
|
|
31
32
|
return await client.statusAction(async (status) => {
|
|
32
33
|
const dpb = createDpb(options);
|
|
@@ -41,6 +42,7 @@ export class AttachmentImpl extends AbstractAttachment {
|
|
|
41
42
|
options?: CreateDatabaseOptions,
|
|
42
43
|
): Promise<AttachmentImpl> {
|
|
43
44
|
const attachment = new AttachmentImpl(client);
|
|
45
|
+
attachment.charSetForNONE = options?.charSetForNONE ?? 'utf8';
|
|
44
46
|
|
|
45
47
|
return await client.statusAction(async (status) => {
|
|
46
48
|
const dpb = createDpb(options);
|
package/src/lib/fb-util.ts
CHANGED
|
@@ -73,6 +73,7 @@ export function createDescriptors(status: fb.Status, metadata?: fb.MessageMetada
|
|
|
73
73
|
ret.push({
|
|
74
74
|
type: metadata.getTypeSync(status, i),
|
|
75
75
|
subType: metadata.getSubTypeSync(status, i),
|
|
76
|
+
charSet: metadata.getCharSetSync(status, i),
|
|
76
77
|
nullOffset: metadata.getNullOffsetSync(status, i),
|
|
77
78
|
offset: metadata.getOffsetSync(status, i),
|
|
78
79
|
length: metadata.getLengthSync(status, i),
|
package/src/lib/statement.ts
CHANGED
|
@@ -2,11 +2,11 @@ import { AttachmentImpl } from './attachment';
|
|
|
2
2
|
import { ResultSetImpl } from './resultset';
|
|
3
3
|
import { TransactionImpl } from './transaction';
|
|
4
4
|
|
|
5
|
-
import { ExecuteOptions, ExecuteQueryOptions, PrepareOptions } from 'node-firebird-driver';
|
|
5
|
+
import { ExecuteOptions, ExecuteQueryOptions, PrepareOptions, StatementType } from 'node-firebird-driver';
|
|
6
6
|
|
|
7
7
|
import { AbstractStatement, commonInfo, getPortableInteger, statementInfo } from 'node-firebird-driver/dist/lib/impl';
|
|
8
8
|
|
|
9
|
-
import { createDataReader, createDataWriter, createDescriptors,
|
|
9
|
+
import { createDataReader, createDataWriter, createDescriptors, DataReader, DataWriter, fixMetadata } from './fb-util';
|
|
10
10
|
|
|
11
11
|
import * as fb from 'node-firebird-native-api';
|
|
12
12
|
|
|
@@ -25,6 +25,7 @@ export class StatementImpl extends AbstractStatement {
|
|
|
25
25
|
outBuffer: Uint8Array;
|
|
26
26
|
dataWriter: DataWriter;
|
|
27
27
|
dataReader: DataReader;
|
|
28
|
+
typePromise?: Promise<StatementType>;
|
|
28
29
|
|
|
29
30
|
static async prepare(
|
|
30
31
|
attachment: AttachmentImpl,
|
|
@@ -167,4 +168,15 @@ export class StatementImpl extends AbstractStatement {
|
|
|
167
168
|
|
|
168
169
|
return asyncFunc();
|
|
169
170
|
}
|
|
171
|
+
|
|
172
|
+
get type(): Promise<StatementType> {
|
|
173
|
+
if (!this.typePromise) {
|
|
174
|
+
const asyncFunc = async (): Promise<StatementType> => {
|
|
175
|
+
return await this.attachment.client.statusAction((status) => this.statementHandle!.getTypeAsync(status));
|
|
176
|
+
};
|
|
177
|
+
this.typePromise = asyncFunc();
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
return this.typePromise;
|
|
181
|
+
}
|
|
170
182
|
}
|