sqlparser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa0a464c04ab5dae6d04b0b8ee0720080149e97
-  data.tar.gz: 3adf0fc5c537d7b45332b1e38eeeec56908dfa65
+  metadata.gz: c0260c9e59a79538f62f1a9bd7c29bfc833474d3
+  data.tar.gz: 07646ce05c4dac71ce33abb83e964de9d7d7498c
 SHA512:
-  metadata.gz: 7008403d781d72ecd30c0124ef380830d638f8d6a542a307ebdf5be1ab9e1c0d5ed40dec4fc35cecfb80d7b4d0b246539b3b264151626d31f3da213e1dfdbe9f
-  data.tar.gz: 89055caecc4669e27c4e4b596774a58ad652909462155479d46a9058a233b3ad87077d2f1e4c1755a0213b549a3b16740f01702e899e32746457f5d035d33424
+  metadata.gz: d74a30269f86ae4593109be446d378ea3fbc8b7f11626c8860ba4f5417439150a0e4c69bd2eddd86102b2eb63ac2b4f71590be67b90affc2474a3ceeb305c878
+  data.tar.gz: 970f429534c80d8511c30e790890446b7ab9ee37bee39fb45d1eedead6e0ce24a8a0729182b34e862b6275bcfd58cee9b3e6697ed9079fedb6030022622a822a

data/lib/sqlparser.rb

@@ -11,10 +11,10 @@ class SqlParser
   def initialize(raw_lines)
 
     patterns = [
-      [:root, 'SELECT *', :select_all],
-      [:root, 'SELECT :cols', :select],
-      [:root, 'FROM :tables', :from],
-      [:root, 'WHERE :condition', :where],
+      [:root, /SELECT \*/, :select_all],
+      [:root, /SELECT (?<cols>.*)/, :select],
+      [:root, /FROM (?<tables>.*)/, :from],
+      [:root, /WHERE (?<condition>.*)/, :where],
         [:where, 'AND :and', :where_and ],
         [:where, 'OR :or', :where_or ],
       [:root, 'INSERT INTO *', :insert_into],
@@ -28,8 +28,8 @@ class SqlParser
          .sub(/\bselect\s+/,'SELECT ')\
          .sub(/\s+from\s+/,"\nFROM ")\
          .sub(/\s+where\s+/,"\nWHERE ")\
-         .sub(/\s+and\s+/,"\n  AND ").sub(/\s+or\s+/,"\n  OR ")
-
+         .sub(/\s+and\s+/,"\n  AND ").sub(/\s+or\s+/,"\n  OR ")    
+    
     @to_a = lp.parse lines
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlparser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson