feat: track the current database collation on the connection

tediousjs · Aug 16, 2021 · d27a7e0 · d27a7e0
1 parent b8cfb08
commit d27a7e0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/connection.ts b/src/connection.ts
@@ -47,6 +47,7 @@ import { MemoryCache } from 'adal-node';
 import AbortController, { AbortSignal } from 'node-abort-controller';
 import { Parameter, TYPES } from './data-type';
 import { BulkLoadPayload } from './bulk-load-payload';
+import { Collation } from './collation';
 
 import { version } from '../package.json';
 
@@ -1021,6 +1022,11 @@ class Connection extends EventEmitter {
    */
   _cancelAfterRequestSent: () => void;
 
+  /**
+   * @private
+   */
+  databaseCollation: Collation | undefined;
+
   /**
    * Note: be aware of the different options field:
    * 1. config.authentication.options
@@ -2023,6 +2029,10 @@ class Connection extends EventEmitter {
       this.emit('charsetChange', token.newValue);
     });
 
+    tokenStreamParser.on('sqlCollationChange', (token) => {
+      this.databaseCollation = token.newValue;
+    });
+
     tokenStreamParser.on('fedAuthInfo', (token) => {
       this.dispatchEvent('fedAuthInfo', token);
     });

diff --git a/src/token/env-change-token-parser.ts b/src/token/env-change-token-parser.ts
@@ -1,5 +1,6 @@
 import Parser from './stream-parser';
 import { InternalConnectionOptions } from '../connection';
+import { Collation } from '../collation';
 
 import {
   DatabaseEnvChangeToken,
@@ -114,8 +115,12 @@ function readNewAndOldValue(parser: Parser, length: number, type: { name: string
       return parser.readBVarByte((newValue) => {
         parser.readBVarByte((oldValue) => {
           switch (type.name) {
-            case 'SQL_COLLATION':
-              return callback(new CollationChangeToken(newValue, oldValue));
+            case 'SQL_COLLATION': {
+              const newCollation = newValue.length ? Collation.fromBuffer(newValue) : undefined;
+              const oldCollation = oldValue.length ? Collation.fromBuffer(oldValue) : undefined;
+
+              return callback(new CollationChangeToken(newCollation, oldCollation));
+            }
 
             case 'BEGIN_TXN':
               return callback(new BeginTransactionEnvChangeToken(newValue, oldValue));

diff --git a/src/token/token-stream-parser.ts b/src/token/token-stream-parser.ts
@@ -26,7 +26,8 @@ import {
   ReturnValueToken,
   DoneInProcToken,
   DoneProcToken,
-  DoneToken
+  DoneToken,
+  CollationChangeToken
 } from './token';
 import { Readable } from 'stream';
 import Message from '../message';
@@ -65,6 +66,7 @@ export class Parser extends EventEmitter {
     ((event: 'databaseChange', listener: (token: DatabaseEnvChangeToken) => void) => this) &
     ((event: 'languageChange', listener: (token: LanguageEnvChangeToken) => void) => this) &
     ((event: 'charsetChange', listener: (token: CharsetEnvChangeToken) => void) => this) &
+    ((event: 'sqlCollationChange', listener: (token: CollationChangeToken) => void) => this) &
     ((event: 'fedAuthInfo', listener: (token: FedAuthInfoToken) => void) => this) &
     ((event: 'featureExtAck', listener: (token: FeatureExtAckToken) => void) => this) &
     ((event: 'loginack', listener: (token: LoginAckToken) => void) => this) &

diff --git a/src/token/token.ts b/src/token/token.ts
@@ -1,3 +1,4 @@
+import { Collation } from '../collation';
 import { Metadata } from '../metadata-parser';
 import { ColumnMetadata } from './colmetadata-token-parser';
 
@@ -281,10 +282,10 @@ export class CollationChangeToken extends Token {
   declare event: 'sqlCollationChange';
 
   type: 'SQL_COLLATION';
-  oldValue: Buffer;
-  newValue: Buffer;
+  oldValue: Collation | undefined;
+  newValue: Collation | undefined;
 
-  constructor(newValue: Buffer, oldValue: Buffer) {
+  constructor(newValue: Collation | undefined, oldValue: Collation | undefined) {
     super('ENVCHANGE', 'sqlCollationChange');
 
     this.type = 'SQL_COLLATION';