Merge branch 'master' into jeremy-w/feat/login-with-utf8-option-1143

tediousjs · Aug 29, 2021 · 6f4a270 · 6f4a270
2 parents 6d3f675 + 1189b4a
commit 6f4a270
Show file tree

Hide file tree

Showing 24 changed files with 751 additions and 290 deletions.
diff --git a/src/always-encrypted/get-parameter-encryption-metadata.ts b/src/always-encrypted/get-parameter-encryption-metadata.ts
@@ -97,5 +97,5 @@ export const getParameterEncryptionMetadata = (connection: Connection, request:
     resultRows.push(columns);
   });
 
-  connection.makeRequest(metadataRequest, TYPE.RPC_REQUEST, new RpcRequestPayload(metadataRequest.sqlTextOrProcedure!, metadataRequest.parameters, connection.currentTransactionDescriptor(), connection.config.options));
+  connection.makeRequest(metadataRequest, TYPE.RPC_REQUEST, new RpcRequestPayload(metadataRequest.sqlTextOrProcedure!, metadataRequest.parameters, connection.currentTransactionDescriptor(), connection.config.options, connection.databaseCollation));
 };
diff --git a/src/bulk-load.ts b/src/bulk-load.ts
@@ -6,6 +6,7 @@ import { Transform } from 'stream';
 import { TYPE as TOKEN_TYPE } from './token/token';
 
 import { DataType, Parameter } from './data-type';
+import { Collation } from './collation';
 
 /**
  * @private
@@ -88,6 +89,7 @@ export type Callback =
 
 interface Column extends Parameter {
   objName: string;
+  collation: Collation | undefined;
 }
 
 interface ColumnOptions {
@@ -180,7 +182,7 @@ class RowTransform extends Transform {
       let value = Array.isArray(row) ? row[i] : row[c.objName];
 
       try {
-        value = c.type.validate(value);
+        value = c.type.validate(value, c.collation);
       } catch (error) {
         return callback(error);
       }
@@ -320,12 +322,14 @@ class BulkLoad extends EventEmitter {
   /**
    * @private
    */
-  rowCount?: number;;
+  rowCount?: number;
+
+  collation: Collation | undefined;
 
   /**
    * @private
    */
-  constructor(table: string, connectionOptions: InternalConnectionOptions, {
+  constructor(table: string, collation: Collation | undefined, connectionOptions: InternalConnectionOptions, {
     checkConstraints = false,
     fireTriggers = false,
     keepNulls = false,
@@ -364,6 +368,8 @@ class BulkLoad extends EventEmitter {
     this.canceled = false;
     this.executionStarted = false;
 
+    this.collation = collation;
+
     this.table = table;
     this.options = connectionOptions;
     this.callback = callback;
@@ -404,7 +410,7 @@ class BulkLoad extends EventEmitter {
       throw new Error('Columns cannot be added to bulk insert after execution has started.');
     }
 
-    const column = {
+    const column: Column = {
       type: type,
       name: name,
       value: null,
@@ -413,7 +419,8 @@ class BulkLoad extends EventEmitter {
       precision: precision,
       scale: scale,
       objName: objName,
-      nullable: nullable
+      nullable: nullable,
+      collation: this.collation
     };
 
     if ((type.id & 0x30) === 0x20) {
@@ -491,11 +498,11 @@ class BulkLoad extends EventEmitter {
     // write each column
     if (Array.isArray(row)) {
       this.rowToPacketTransform.write(this.columns.map((column, i) => {
-        return column.type.validate(row[i]);
+        return column.type.validate(row[i], column.collation);
       }));
     } else {
       this.rowToPacketTransform.write(this.columns.map((column) => {
-        return column.type.validate(row[column.objName]);
+        return column.type.validate(row[column.objName], column.collation);
       }));
     }
   }