Fix #4 Support ILIKE operator

mistic100 · Apr 2, 2018 · 991ee17 · 991ee17
1 parent bb21b4a
commit 991ee17
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/Cakefile b/Cakefile
@@ -8,7 +8,7 @@ header = """
 /*!
  * SQLParser #{pkg.version}
  * Copyright 2012-2015 Andy Kent <andy@forward.co.uk>
- * Copyright 2015-2018 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * Copyright 2015-2018 Damien "Mistic" Sorel (https://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
 """

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
 Copyright (c) 2012 Andrew Kent
+Copyright (c) 2016-2018 Damien "Mistic" Sorel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/browser/sql-parser.js b/browser/sql-parser.js
@@ -1,7 +1,7 @@
 /*!
- * SQLParser 1.2.0
+ * SQLParser 1.2.1
  * Copyright 2012-2015 Andy Kent <andy@forward.co.uk>
- * Copyright 2015-2018 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * Copyright 2015-2018 Damien "Mistic" Sorel (https://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
 (function(root) {
@@ -238,7 +238,7 @@
 
     SQL_SORT_ORDERS = ['ASC', 'DESC'];
 
-    SQL_OPERATORS = ['=', '!=', '>=', '>', '<=', '<>', '<', 'LIKE', 'NOT LIKE', 'IS NOT', 'IS', 'REGEXP'];
+    SQL_OPERATORS = ['=', '!=', '>=', '>', '<=', '<>', '<', 'LIKE', 'NOT LIKE', 'ILIKE', 'NOT ILIKE', 'IS', 'IS NOT', 'REGEXP', 'NOT REGEXP'];
 
     SUB_SELECT_OP = ['IN', 'NOT IN', 'ANY', 'ALL', 'SOME'];
 

diff --git a/browser/sql-parser.min.js b/browser/sql-parser.min.js
diff --git a/lib/lexer.js b/lib/lexer.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sql-parser-mistic",
   "description": "Lexer and Parser for SQL Syntax",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": {
     "name": "Andy Kent",
     "email": "andy@forward.co.uk"

diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -157,7 +157,7 @@ class Lexer
 
   SQL_FUNCTIONS       = ['AVG', 'COUNT', 'MIN', 'MAX', 'SUM']
   SQL_SORT_ORDERS     = ['ASC', 'DESC']
-  SQL_OPERATORS       = ['=', '!=', '>=', '>', '<=', '<>', '<', 'LIKE', 'NOT LIKE', 'IS NOT', 'IS', 'REGEXP', 'NOT REGEXP']
+  SQL_OPERATORS       = ['=', '!=', '>=', '>', '<=', '<>', '<', 'LIKE', 'NOT LIKE', 'ILIKE', 'NOT ILIKE', 'IS', 'IS NOT', 'REGEXP', 'NOT REGEXP']
   SUB_SELECT_OP       = ['IN', 'NOT IN', 'ANY', 'ALL', 'SOME']
   SUB_SELECT_UNARY_OP = ['EXISTS']
   SQL_CONDITIONALS    = ['AND', 'OR']

diff --git a/test/grammar.spec.coffee b/test/grammar.spec.coffee
@@ -148,6 +148,13 @@ describe "SQL Grammar", ->
         WHERE ((`foo` LIKE '%a') AND (`bar` NOT LIKE 'b%'))
       """
 
+    it "parses WHERE with ILIKE and NOT ILIKE clauses", ->
+      parse("SELECT * FROM my_table WHERE foo ILIKE '%a' AND bar NOT ILIKE 'b%'").toString().should.eql """
+      SELECT *
+        FROM `my_table`
+        WHERE ((`foo` ILIKE '%a') AND (`bar` NOT ILIKE 'b%'))
+      """
+
     it "parses WHERE with ORDER BY clauses", ->
       parse("SELECT * FROM my_table WHERE x > 1 ORDER BY y").toString().should.eql """
       SELECT *