Fix issue 1 in #22

dsferruzza · Dec 29, 2015 · 189b5c0 · 189b5c0
1 parent a1a8882
commit 189b5c0
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 11 deletions.
diff --git a/dist/simpleSqlParser.js b/dist/simpleSqlParser.js
@@ -967,7 +967,13 @@ var argListExpression = expression.map(function(node) {
 var tableListExpression = seq(
 	alt(
 		tableAndColumn.map(mkString),
-		colName
+		colName,
+		regex(/"([^"\\]*(?:\\.[^"\\]*)*)"/, 1).map(function(node) {
+			return {
+				table: node,
+				expression: '"' + node + '"',
+			};
+		})
 	),
 	opt(	// Alias
 		seq(
@@ -984,9 +990,15 @@ var tableListExpression = seq(
 	)
 ).map(function(node) {
 	var n = {};
-	n.table = node[0];
+	if (typeof node[0] === 'object') {
+		n.table = node[0].table;
+		n.expression = node[0].expression;
+	}
+	else {
+		n.table = node[0];
+		n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
+	}
 	n.alias = (node[1] !== null) ? node[1].alias : null;
-	n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
 	return n;
 });
 

diff --git a/dist/simpleSqlParser.min.js b/dist/simpleSqlParser.min.js
diff --git a/dist/simpleSqlParser.withoutDeps.js b/dist/simpleSqlParser.withoutDeps.js
@@ -435,7 +435,13 @@ var argListExpression = expression.map(function(node) {
 var tableListExpression = seq(
 	alt(
 		tableAndColumn.map(mkString),
-		colName
+		colName,
+		regex(/"([^"\\]*(?:\\.[^"\\]*)*)"/, 1).map(function(node) {
+			return {
+				table: node,
+				expression: '"' + node + '"',
+			};
+		})
 	),
 	opt(	// Alias
 		seq(
@@ -452,9 +458,15 @@ var tableListExpression = seq(
 	)
 ).map(function(node) {
 	var n = {};
-	n.table = node[0];
+	if (typeof node[0] === 'object') {
+		n.table = node[0].table;
+		n.expression = node[0].expression;
+	}
+	else {
+		n.table = node[0];
+		n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
+	}
 	n.alias = (node[1] !== null) ? node[1].alias : null;
-	n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
 	return n;
 });
 

diff --git a/dist/simpleSqlParser.withoutDeps.min.js b/dist/simpleSqlParser.withoutDeps.min.js
diff --git a/src/sql2ast.js b/src/sql2ast.js
@@ -282,7 +282,13 @@ var argListExpression = expression.map(function(node) {
 var tableListExpression = seq(
 	alt(
 		tableAndColumn.map(mkString),
-		colName
+		colName,
+		regex(/"([^"\\]*(?:\\.[^"\\]*)*)"/, 1).map(function(node) {
+			return {
+				table: node,
+				expression: '"' + node + '"',
+			};
+		})
 	),
 	opt(	// Alias
 		seq(
@@ -299,9 +305,15 @@ var tableListExpression = seq(
 	)
 ).map(function(node) {
 	var n = {};
-	n.table = node[0];
+	if (typeof node[0] === 'object') {
+		n.table = node[0].table;
+		n.expression = node[0].expression;
+	}
+	else {
+		n.table = node[0];
+		n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
+	}
 	n.alias = (node[1] !== null) ? node[1].alias : null;
-	n.expression = node[0] + ((node[1] !== null) ? node[1].expression : '');
 	return n;
 });
 

diff --git a/tests/tests-select.js b/tests/tests-select.js
@@ -22,6 +22,24 @@ var Select = [
 			limit: null,
 		},
 	},
+	{
+		c: 'Quoted table name',
+		q: 'SELECT * FROM "quoted.table"',
+		a: {
+			type: 'select',
+			select: [
+				{ expression: '*', column: '*', table: null, alias: null, position: { start: 7, end: 8 } },
+			],
+			from: [
+				{ expression: '"quoted.table"', table: 'quoted.table', alias: null, position: { start: 14, end: 28 } },
+			],
+			join: [],
+			where: null,
+			group: [],
+			order: [],
+			limit: null,
+		},
+	},
 	{
 		c: 'Column quotes',
 		q: 'SELECT col1, `col2` FROM table',