Fix issue 2 in #22

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

Hide file tree

Showing 6 changed files with 83 additions and 2 deletions.
diff --git a/dist/simpleSqlParser.js b/dist/simpleSqlParser.js
@@ -836,6 +836,19 @@ var operator = alt(
 // A number
 var number = regex(/[-]?\d+\.?\d*/);
 
+// A duration
+var duration = seq(
+	number,
+	alt(
+		string('u'),
+		string('s'),
+		string('m'),
+		string('h'),
+		string('d'),
+		string('w')
+	)
+);
+
 
 
 /********************************************************************************************
@@ -896,6 +909,13 @@ var expression = seq(
 				column: null,
 			};
 		}),
+		duration.map(function(node) {
+			return {
+				expression: mkString(node),
+				table: null,
+				column: null,
+			};
+		}),
 		number.map(function(node) {
 			return {
 				expression: node,

diff --git a/dist/simpleSqlParser.min.js b/dist/simpleSqlParser.min.js
diff --git a/dist/simpleSqlParser.withoutDeps.js b/dist/simpleSqlParser.withoutDeps.js
@@ -304,6 +304,19 @@ var operator = alt(
 // A number
 var number = regex(/[-]?\d+\.?\d*/);
 
+// A duration
+var duration = seq(
+	number,
+	alt(
+		string('u'),
+		string('s'),
+		string('m'),
+		string('h'),
+		string('d'),
+		string('w')
+	)
+);
+
 
 
 /********************************************************************************************
@@ -364,6 +377,13 @@ var expression = seq(
 				column: null,
 			};
 		}),
+		duration.map(function(node) {
+			return {
+				expression: mkString(node),
+				table: null,
+				column: null,
+			};
+		}),
 		number.map(function(node) {
 			return {
 				expression: node,

diff --git a/dist/simpleSqlParser.withoutDeps.min.js b/dist/simpleSqlParser.withoutDeps.min.js
diff --git a/src/sql2ast.js b/src/sql2ast.js
@@ -151,6 +151,19 @@ var operator = alt(
 // A number
 var number = regex(/[-]?\d+\.?\d*/);
 
+// A duration
+var duration = seq(
+	number,
+	alt(
+		string('u'),
+		string('s'),
+		string('m'),
+		string('h'),
+		string('d'),
+		string('w')
+	)
+);
+
 
 
 /********************************************************************************************
@@ -211,6 +224,13 @@ var expression = seq(
 				column: null,
 			};
 		}),
+		duration.map(function(node) {
+			return {
+				expression: mkString(node),
+				table: null,
+				column: null,
+			};
+		}),
 		number.map(function(node) {
 			return {
 				expression: node,

diff --git a/tests/tests-select.js b/tests/tests-select.js
@@ -362,6 +362,27 @@ var Select = [
 			limit: { from: null, nb: 1 },
 		},
 	},
+	{
+		c: 'Durations',
+		q: 'SELECT * FROM table WHERE this >= 15m',
+		a: {
+			type: 'select',
+			select: [
+				{ expression: '*', column: '*', table: null, alias: null, position: { start: 7, end: 8 } },
+			],
+			from: [
+				{ expression: 'table', table: 'table', alias: null, position: { start: 14, end: 19 } },
+			],
+			join: [],
+			where: {
+				expression: 'this >= 15m',
+				position: { start: 26, end: 37 },
+			},
+			group: [],
+			order: [],
+			limit: null,
+		},
+	},
 	{
 		c: 'Group by',
 		q: 'SELECT * FROM table GROUP BY col1, MONTH(col2), table.col3',