Fix errors for semicolons within quotes

neo4j · May 23, 2017 · 4269c9d · 4269c9d
1 parent d24126b
commit 4269c9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/shared/services/commandUtils.js b/src/shared/services/commandUtils.js
@@ -87,9 +87,23 @@ export const getInterpreter = (interpret, cmd, cmdchar) => {
 export const isNamedInterpreter = (interpreter) => interpreter && interpreter.name !== 'catch-all'
 
 export const extractPostConnectCommandsFromServerConfig = (str) => {
+  const substituteStr = '@@semicolon@@'
+  const substituteRe = new RegExp(substituteStr, 'g')
+  const replaceFn = (m) => {
+    return m.replace(/;/g, substituteStr)
+  }
+  const qs = [
+    /(`[^`]*?`)/g,
+    /("[^"]*?")/g,
+    /('[^']*?')/g
+  ]
+  qs.forEach((q) => {
+    str = str.replace(q, replaceFn)
+  })
   const splitted = str
     .split(';')
     .map((item) => item.trim())
+    .map((item) => item.replace(substituteRe, ';'))
     .filter((item) => item && item.length)
   return splitted && splitted.length ? splitted : undefined
 }
diff --git a/src/shared/services/commandUtils.test.js b/src/shared/services/commandUtils.test.js
@@ -126,7 +126,12 @@ describe('commandutils', () => {
       { str: ':play cypher ;', expect: [':play cypher'] },
       { str: ';:play cypher;', expect: [':play cypher'] },
       { str: ':play cypher; :param x: 1', expect: [':play cypher', ':param x: 1'] },
-      { str: 'RETURN 1; RETURN 3; :play start', expect: ['RETURN 1', 'RETURN 3', ':play start'] }
+      { str: 'RETURN 1; RETURN 3; :play start', expect: ['RETURN 1', 'RETURN 3', ':play start'] },
+      { str: 'MATCH (n: {foo: "bar;", bar: "foo;"}) RETURN n', expect: ['MATCH (n: {foo: "bar;", bar: "foo;"}) RETURN n'] },
+      { str: 'MATCH (n: {foo: \'bar;\'}) RETURN n', expect: ['MATCH (n: {foo: \'bar;\'}) RETURN n'] },
+      { str: 'MATCH (n: {foo: `bar;`}) RETURN n', expect: ['MATCH (n: {foo: `bar;`}) RETURN n'] },
+      { str: 'MATCH (n: {foo: `bar;;`}) RETURN n', expect: ['MATCH (n: {foo: `bar;;`}) RETURN n'] },
+      { str: ':play cypher; MATCH (n: {foo: `bar; en;`}) RETURN n', expect: [':play cypher', 'MATCH (n: {foo: `bar; en;`}) RETURN n'] }
     ]
 
     // When & Then