ms sql - keep semicolon in commands

Author: SPRINX0\prochazka

src/options.ts

@@ -22,6 +22,7 @@ export interface SplitterOptions {
   preventSingleLineSplit: boolean;
   // overrides allowSemicolon, allowGoDelimiter setting. splits by semicolon, after CREATE PROCEDURE, CREATE FUNCTION, GO separator is required
   adaptiveGoSplit: boolean;
+  keepSemicolonInCommands: boolean;
 
   returnRichInfo: boolean;
   splitByLines: boolean;
@@ -45,6 +46,7 @@ export const defaultSplitterOptions: SplitterOptions = {
   allowDollarDollarString: false,
   noSplit: false,
   skipSeparatorBeginEnd: false,
+  keepSemicolonInCommands: false,
 
   doubleDashComments: true,
   multilineComments: true,
@@ -74,6 +76,7 @@ export const mssqlSplitterOptions: SplitterOptions = {
   ...defaultSplitterOptions,
   allowSemicolon: false,
   allowGoDelimiter: true,
+  keepSemicolonInCommands: true,
 
   stringsBegins: ["'", '['],
   stringsEnds: { "'": "'", '[': ']' },

src/splitQuery.ts

@@ -635,9 +635,14 @@ export function splitQueryLine(context: SplitLineContext) {
           context.wasDataOnLine = true;
           break;
         }
-        pushQuery(context);
+        if (context.options.keepSemicolonInCommands && context.currentDelimiter === SEMICOLON) {
+          movePosition(context, 1, false);
+          pushQuery(context);
+        } else {
+          pushQuery(context);
+          movePosition(context, token.length, false);
+        }
         context.commandPart = '';
-        movePosition(context, token.length, false);
         context.currentCommandStart = context.position;
         markStartCommand(context);
         context.isCopyFromStdinCandidate = false;

src/splitter.test.ts

@@ -61,13 +61,21 @@ test('semicolon inside string', () => {
   expect(output).toEqual(input);
 });
 
-test('semicolon inside identyifier - mssql', () => {
+test('semicolon inside identifier - mssql', () => {
   const input = ['CREATE TABLE [a;1]', "INSERT INTO [a;1] (x) VALUES ('1')"];
   const output = splitQuery(input.join(';\n') + ';', {
     ...mssqlSplitterOptions,
     allowSemicolon: true,
   });
-  expect(output).toEqual(input);
+  expect(output).toEqual(input.map(x => x + ';'));
+});
+
+test('mssql correct merge statement - mssql', () => {
+  const output = splitQuery('SET IDENTITY ON;\nMERGE INTO TARGET;\nSET IDENTITY OFF;', {
+    ...mssqlSplitterOptions,
+    allowSemicolon: true,
+  });
+  expect(output).toEqual(['SET IDENTITY ON;', 'MERGE INTO TARGET;', 'SET IDENTITY OFF;']);
 });
 
 test('prevent single line split - mysql', () => {
@@ -104,10 +112,10 @@ test('adaptive go split -mssql', () => {
     }
   );
   expect(output).toEqual([
-    'SELECT 1',
+    'SELECT 1;',
     'CREATE PROCEDURE p1 AS BEGIN SELECT 2;SELECT 3;END',
-    'SELECT 4',
-    'SELECT 5',
+    'SELECT 4;',
+    'SELECT 5;',
     'ALTER PROCEDURE p1 AS BEGIN SELECT 2;SELECT 3;END',
   ]);
 });
@@ -376,4 +384,3 @@ END`;
   expect(output.length).toBe(1);
   expect(output[0]).toEqual(input);
 });
-