node-firebird-driver-native 3.2.2 → 3.4.0

package/src/lib/fb-util.ts

@@ -3,82 +3,82 @@ export * from 'node-firebird-driver/dist/lib/impl';
 
 import * as fb from 'node-firebird-native-api';
 
-
 /** Fix metadata descriptors to types we want to read. */
 export function fixMetadata(status: fb.Status, metadata?: fb.MessageMetadata): fb.MessageMetadata | undefined {
-	if (!metadata)
-		return undefined;
-
-	let ret: fb.MessageMetadata;
-
-	const outBuilder = metadata.getBuilderSync(status)!;
-	try {
-		for (let i = metadata.getCountSync(status) - 1; i >= 0; --i) {
-			switch (metadata.getTypeSync(status, i)) {
-				// Transform CHAR descriptors to VARCHAR.
-				case sqlTypes.SQL_TEXT:
-					outBuilder.setTypeSync(status, i, sqlTypes.SQL_VARYING);
-					break;
-
-				// Transform numeric descriptors to DOUBLE PRECISION.
-				case sqlTypes.SQL_SHORT:
-				case sqlTypes.SQL_LONG:
-				case sqlTypes.SQL_INT64:
-				case sqlTypes.SQL_FLOAT:
-					outBuilder.setTypeSync(status, i, sqlTypes.SQL_DOUBLE);
-					outBuilder.setLengthSync(status, i, 8);
-					outBuilder.setScaleSync(status, i, 0);
-					break;
-
-				// Transform TIME_TZ to TIME_TZ_EX.
-				case sqlTypes.SQL_TIME_TZ:
-					outBuilder.setTypeSync(status, i, sqlTypes.SQL_TIME_TZ_EX);
-					break;
-
-				// Transform TIMESTAMP_TZ to TIMESTAMP_TZ_EX.
-				case sqlTypes.SQL_TIMESTAMP_TZ:
-					outBuilder.setTypeSync(status, i, sqlTypes.SQL_TIMESTAMP_TZ_EX);
-					break;
-
-				// Transform INT128, DEC16 and DEC34 descriptors to VARCHAR.
-				case sqlTypes.SQL_INT128:
-				case sqlTypes.SQL_DEC16:
-				case sqlTypes.SQL_DEC34:
-					outBuilder.setTypeSync(status, i, sqlTypes.SQL_VARYING);
-					outBuilder.setLengthSync(status, i, 45);
-					outBuilder.setCharSetSync(status, i, charSets.ascii);
-					break;
-			}
-		}
-
-		ret = outBuilder.getMetadataSync(status)!;
-	}
-	finally {
-		outBuilder.releaseSync();
-	}
-
-	metadata.releaseSync();
-
-	return ret;
+  if (!metadata) {
+    return undefined;
+  }
+
+  let ret: fb.MessageMetadata;
+
+  const outBuilder = metadata.getBuilderSync(status)!;
+  try {
+    for (let i = metadata.getCountSync(status) - 1; i >= 0; --i) {
+      switch (metadata.getTypeSync(status, i)) {
+        // Transform CHAR descriptors to VARCHAR.
+        case sqlTypes.SQL_TEXT:
+          outBuilder.setTypeSync(status, i, sqlTypes.SQL_VARYING);
+          break;
+
+        // Transform numeric descriptors to DOUBLE PRECISION.
+        case sqlTypes.SQL_SHORT:
+        case sqlTypes.SQL_LONG:
+        case sqlTypes.SQL_INT64:
+        case sqlTypes.SQL_FLOAT:
+          outBuilder.setTypeSync(status, i, sqlTypes.SQL_DOUBLE);
+          outBuilder.setLengthSync(status, i, 8);
+          outBuilder.setScaleSync(status, i, 0);
+          break;
+
+        // Transform TIME_TZ to TIME_TZ_EX.
+        case sqlTypes.SQL_TIME_TZ:
+          outBuilder.setTypeSync(status, i, sqlTypes.SQL_TIME_TZ_EX);
+          break;
+
+        // Transform TIMESTAMP_TZ to TIMESTAMP_TZ_EX.
+        case sqlTypes.SQL_TIMESTAMP_TZ:
+          outBuilder.setTypeSync(status, i, sqlTypes.SQL_TIMESTAMP_TZ_EX);
+          break;
+
+        // Transform INT128, DEC16 and DEC34 descriptors to VARCHAR.
+        case sqlTypes.SQL_INT128:
+        case sqlTypes.SQL_DEC16:
+        case sqlTypes.SQL_DEC34:
+          outBuilder.setTypeSync(status, i, sqlTypes.SQL_VARYING);
+          outBuilder.setLengthSync(status, i, 45);
+          outBuilder.setCharSetSync(status, i, charSets.ascii);
+          break;
+      }
+    }
+
+    ret = outBuilder.getMetadataSync(status)!;
+  } finally {
+    outBuilder.releaseSync();
+  }
+
+  metadata.releaseSync();
+
+  return ret;
 }
 
 export function createDescriptors(status: fb.Status, metadata?: fb.MessageMetadata): Descriptor[] {
-	if (!metadata)
-		return [];
-
-	const count = metadata.getCountSync(status);
-	const ret: Descriptor[] = [];
-
-	for (let i = 0; i < count; ++i) {
-		ret.push({
-			type: metadata.getTypeSync(status, i),
-			subType: metadata.getSubTypeSync(status, i),
-			nullOffset: metadata.getNullOffsetSync(status, i),
-			offset: metadata.getOffsetSync(status, i),
-			length: metadata.getLengthSync(status, i),
-			scale: metadata.getScaleSync(status, i)
-		});
-	}
-
-	return ret;
+  if (!metadata) {
+    return [];
+  }
+
+  const count = metadata.getCountSync(status);
+  const ret: Descriptor[] = [];
+
+  for (let i = 0; i < count; ++i) {
+    ret.push({
+      type: metadata.getTypeSync(status, i),
+      subType: metadata.getSubTypeSync(status, i),
+      nullOffset: metadata.getNullOffsetSync(status, i),
+      offset: metadata.getOffsetSync(status, i),
+      length: metadata.getLengthSync(status, i),
+      scale: metadata.getScaleSync(status, i),
+    });
+  }
+
+  return ret;
 }

package/src/lib/resultset.ts

@@ -6,88 +6,100 @@ import { AbstractResultSet } from 'node-firebird-driver/dist/lib/impl';
 
 import * as fb from 'node-firebird-native-api';
 
-
 /** ResultSet implementation. */
 export class ResultSetImpl extends AbstractResultSet {
-	// Override declarations.
-	override statement: StatementImpl;
-	override transaction: TransactionImpl;
-
-	resultSetHandle?: fb.ResultSet;
-	delayedError: any;
-
-	static async open(statement: StatementImpl, transaction: TransactionImpl, parameters?: Array<any>,
-			options?: ExecuteQueryOptions): Promise<ResultSetImpl> {
-		const resultSet = new ResultSetImpl(statement, transaction);
-
-		return await statement.attachment.client.statusAction(async status => {
-			//// FIXME: options
-
-			await statement.dataWriter(statement.attachment, transaction, statement.inBuffer, parameters);
-
-			resultSet.resultSetHandle = await statement.statementHandle!.openCursorAsync(status, transaction.transactionHandle,
-				statement.inMetadata, statement.inBuffer, statement.outMetadata, 0);
-
-			return resultSet;
-		});
-	}
-
-	/** Closes this result set. */
-	protected async internalClose(): Promise<void> {
-		await this.statement.attachment.client.statusAction(async status => {
-			await this.resultSetHandle!.closeAsync(status);
-
-			this.resultSetHandle = undefined;
-		});
-	}
-
-	/** Fetchs data from this result set. */
-	protected async internalFetch(options?: FetchOptions): Promise<{ finished: boolean; rows: any[][] }> {
-		return await this.statement.attachment.client.statusAction(async status => {
-			if (this.delayedError) {
-				const error = this.delayedError;
-				this.delayedError = undefined;
-				throw error;
-			}
-
-			const rows = [];
-			const buffers = [this.statement.outBuffer, new Uint8Array(this.statement.outMetadata!.getMessageLengthSync(status))];
-			let buffer = 0;
-			let nextFetchPromise = this.resultSetHandle!.fetchNextAsync(status, buffers[buffer]);
-
-			while (true) {
-				let nextFetch: number;
-
-				try {
-					nextFetch = await nextFetchPromise;
-				}
-				catch (e) {
-					if (rows.length == 0)
-						throw e;
-					else {
-						this.delayedError = e;
-						return { finished: false, rows };
-					}
-				}
-
-				if (nextFetch == fb.Status.RESULT_OK) {
-					const buffer1 = buffer;
-					buffer = ++buffer % 2;
-
-					const finish = options && options.fetchSize && rows.length + 1 >= options.fetchSize;
-
-					if (!finish)
-						nextFetchPromise = this.resultSetHandle!.fetchNextAsync(status, buffers[buffer]);
-
-					rows.push(await this.statement.dataReader(this.statement.attachment, this.transaction, buffers[buffer1]));
-
-					if (finish)
-						return { finished: false, rows };
-				}
-				else {
-					return { finished: true, rows };
-				}
-			}
-		});
-	}
+  // Override declarations.
+  override statement: StatementImpl;
+  override transaction: TransactionImpl;
+
+  resultSetHandle?: fb.ResultSet;
+  delayedError: any;
+
+  static async open(
+    statement: StatementImpl,
+    transaction: TransactionImpl,
+    parameters?: any[],
+    _options?: ExecuteQueryOptions,
+  ): Promise<ResultSetImpl> {
+    const resultSet = new ResultSetImpl(statement, transaction);
+
+    return await statement.attachment.client.statusAction(async (status) => {
+      //// FIXME: options
+
+      await statement.dataWriter(statement.attachment, transaction, statement.inBuffer, parameters);
+
+      resultSet.resultSetHandle = await statement.statementHandle!.openCursorAsync(
+        status,
+        transaction.transactionHandle,
+        statement.inMetadata,
+        statement.inBuffer,
+        statement.outMetadata,
+        0,
+      );
+
+      return resultSet;
+    });
+  }
+
+  /** Closes this result set. */
+  protected async internalClose(): Promise<void> {
+    await this.statement.attachment.client.statusAction(async (status) => {
+      await this.resultSetHandle!.closeAsync(status);
+
+      this.resultSetHandle = undefined;
+    });
+  }
+
+  /** Fetchs data from this result set. */
+  protected async internalFetch(options?: FetchOptions): Promise<{ finished: boolean; rows: any[][] }> {
+    return await this.statement.attachment.client.statusAction(async (status) => {
+      if (this.delayedError) {
+        const error = this.delayedError;
+        this.delayedError = undefined;
+        throw error;
+      }
+
+      const rows = [];
+      const buffers = [
+        this.statement.outBuffer,
+        new Uint8Array(this.statement.outMetadata!.getMessageLengthSync(status)),
+      ];
+      let buffer = 0;
+      let nextFetchPromise = this.resultSetHandle!.fetchNextAsync(status, buffers[buffer]);
+
+      while (true) {
+        let nextFetch: number;
+
+        try {
+          nextFetch = await nextFetchPromise;
+        } catch (e) {
+          if (rows.length == 0) {
+            throw e;
+          } else {
+            this.delayedError = e;
+            return { finished: false, rows };
+          }
+        }
+
+        if (nextFetch == fb.Status.RESULT_OK) {
+          const buffer1 = buffer;
+          buffer = ++buffer % 2;
+
+          const finish = options && options.fetchSize && rows.length + 1 >= options.fetchSize;
+
+          if (!finish) {
+            nextFetchPromise = this.resultSetHandle!.fetchNextAsync(status, buffers[buffer]);
+          }
+
+          rows.push(await this.statement.dataReader(this.statement.attachment, this.transaction, buffers[buffer1]));
+
+          if (finish) {
+            return { finished: false, rows };
+          }
+        } else {
+          return { finished: true, rows };
+        }
+      }
+    });
+  }
 }