dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-17 21:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CASE problem in ACE sql-server mode

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-01-27 11:07:24 +01:00
parent 7f95674113
commit 6b64928a4c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/ace-builds+1.33.1.patch → patches/ace-builds+1.36.5.patch
View File

@@ -1,5 +1,5 @@
diff --git a/node_modules/ace-builds/src-noconflict/mode-sqlserver.js b/node_modules/ace-builds/src-noconflict/mode-sqlserver.js diff --git a/node_modules/ace-builds/src-noconflict/mode-sqlserver.js b/node_modules/ace-builds/src-noconflict/mode-sqlserver.js
index 7e61d3d..3e0fb97 100644 index 799d0d8..5ebe1f1 100644
--- a/node_modules/ace-builds/src-noconflict/mode-sqlserver.js --- a/node_modules/ace-builds/src-noconflict/mode-sqlserver.js
+++ b/node_modules/ace-builds/src-noconflict/mode-sqlserver.js +++ b/node_modules/ace-builds/src-noconflict/mode-sqlserver.js
@@ -304,7 +304,7 @@ var BaseFoldMode = require("./cstyle").FoldMode; @@ -304,7 +304,7 @@ var BaseFoldMode = require("./cstyle").FoldMode;
@@ -7,7 +7,7 @@ index 7e61d3d..3e0fb97 100644
oop.inherits(FoldMode, BaseFoldMode); oop.inherits(FoldMode, BaseFoldMode);
(function () { (function () {
- this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/i; - this.foldingStartMarker = /(\bCASE\b|\bBEGIN\b)|^\s*(\/\*)/i;
+ this.foldingStartMarker = /(?<!\[)(\bCASE\b|\bBEGIN\b)(?!\])|^\s*(\/\*)/i; + this.foldingStartMarker = /(?<!\[)(\bBEGIN\b)(?!\])|^\s*(\/\*)/i;
this.startRegionRe = /^\s*(\/\*|--)#?region\b/; this.startRegionRe = /^\s*(\/\*|--)#?region\b/;
this.getFoldWidgetRange = function (session, foldStyle, row, forceMultiline) { this.getFoldWidgetRange = function (session, foldStyle, row, forceMultiline) {
var line = session.getLine(row); var line = session.getLine(row);
@@ -16,7 +16,7 @@ index 7e61d3d..3e0fb97 100644
var line; var line;
var depth = 1; var depth = 1;
- var re = /(\bCASE\b|\bBEGIN\b)|(\bEND\b)/i; - var re = /(\bCASE\b|\bBEGIN\b)|(\bEND\b)/i;
+ var re = /(?<!\[)(\bCASE\b|\bBEGIN\b)|(\bEND\b)(?!\])/i; + var re = /(?<!\[)(\bBEGIN\b)|(\bEND\b)(?!\])/i;
while (++row < maxRow) { while (++row < maxRow) {
line = session.getLine(row); line = session.getLine(row);
var m = re.exec(line); var m = re.exec(line);