tsql_parser 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f15eed54caa7c7f4c7525b27d302577ed8a07c3fce61b6af631ccc4bfbb3cc
-  data.tar.gz: 06ad8019af83fbb0679692eb0ef91b6ee0258cca4e1c79c924d034d0e537c7f7
+  metadata.gz: 18f0af056c66e37a5b5f541779ee7387fc5756884f5e2d302329f7c8b35b9bfe
+  data.tar.gz: e914e56c485ec9fc0e282f27734d36e17b8a16bb220a4288744f7e45ac263614
 SHA512:
-  metadata.gz: 56978f16697970a06636ccb533f50bf0528199622724568eea071647dcba591c14baa6e05564846f876fc01d413a64f2fdcb2e3f3e2f5b81cdd7a6a2f5c11d76
-  data.tar.gz: 8c874fde5552f5e331d618b5e8ed427e8442cfbe513d3f43e59330c04298022637be9b821f7c6dce621368c9f2449b9ad878d28fc96f84ae17676a834cd3343a
+  metadata.gz: 565804ec4625e5bde30d5ef68d52a44d98317a803f1e4e90dedbb13f0805906ed165f9b4ac972bad845d13a41d72926344c02c8cf30a17c6b2b537a8a85eab42
+  data.tar.gz: c52b196c627315e281b33f4b7cb20ed0ac11d7b0290a1ead14cb45feb71b4c165e7bdf87098f9ea1c36aaa2814be38adc35251313a90bc9731e5a1df2e827690

data/lib/parsing/formatter.rb

@@ -48,9 +48,16 @@ module TSqlParser::Parsing
           new_lines << ""
           next
         end
+
         if Parser.is_newline_required? first or first.start_with? "/*"
           new_lines << ""
         end
+        
+        if Parser.is_label? first
+          #tab_count = self.get_tab_count(line)
+          # TODO: tab it out
+        end
+
         new_lines << line
       end
       new_lines
@@ -71,10 +78,13 @@ module TSqlParser::Parsing
         next_line = work_lines[index + 1] unless index + 1 > work_lines.size
         next_line_first = next_line.strip.split(" ").first unless next_line.nil?
 
-        if %w[CASE BEGIN SELECT].include? first or line.strip.start_with? "CREATE PROCEDURE"
+        if Parser.is_label? first
           indented_lines << "#{tab * tab_count}#{line}"
           tab_count += 1
-        elsif %w[FROM END GO].include? first and not %w[DELETE UPDATE INSERT].include? last
+        elsif %w[CASE BEGIN SELECT].include? first or line.strip.start_with? "CREATE PROCEDURE"
+          indented_lines << "#{tab * tab_count}#{line}"
+          tab_count += 1
+        elsif %w[FROM END GO].include? first and not %w[DELETE UPDATE INSERT SET].include? last
           tab_count -= 1 if tab_count > 0
           indented_lines << "#{tab * tab_count}#{line}"
         else
@@ -128,8 +138,26 @@ module TSqlParser::Parsing
     def self.as_containers(tokens)
       containers = []
       container = nil
-      tokens.each do |t|
+      skip_count = 0
+      tokens.each_with_index do |t, index|
+        if skip_count > 0
+          skip_count -= 1
+          next
+        end
+
+        next_token = tokens[index + 1]
         if Parser.is_new_node_keyword? t[:value]
+          if not next_token.nil? and Parser.is_new_node_keyword? next_token[:value]
+            if Parser.is_new_node_composite?(t[:value], next_token[:value])
+              containers << container unless container.nil?
+              container = SqlContainer.combine(t, next_token)
+              skip_count = 1
+              next
+            end
+          end
+          containers << container unless container.nil?
+          container = SqlContainer.new(t)
+        elsif t[:label]
           containers << container unless container.nil?
           container = SqlContainer.new(t)
         else

data/lib/parsing/keyword.rb

@@ -24,8 +24,8 @@ module TSqlParser::Parsing
     end
 
     def self.get_new_node_keywords
-      %w[CREATE ALTER DROP RENAME SELECT INSERT UPDATE DELETE WHILE IF ELSE DECLARE SET WITH BEGIN FROM WHERE INNER LEFT JOIN END GO GROUP ORDER CASE PRINT RETURN] \
-        - %w[WHERE SET WITH]
+      %w[CREATE ALTER DROP RENAME SELECT INSERT UPDATE DELETE WHILE IF ELSE DECLARE SET WITH BEGIN FROM WHERE INNER LEFT JOIN END GO GROUP ORDER CASE PRINT RETURN GOTO OPEN CLOSE DEALLOCATE FETCH] \
+        - %w[WITH LEFT RIGHT]
     end
 
     def self.get_begin_keyword

data/lib/parsing/model/sql_container.rb

@@ -21,6 +21,17 @@ module TSqlParser::Parsing
       @nodes = []
     end
 
+    def self.combine(first, second)
+      token = {}
+      token[:value] = "#{first[:value]} #{second[:value]}"
+      [first, second].each do |t|
+        t.each do |k, v|
+          token[k] = v unless token.has_key? k
+        end
+      end
+      SqlContainer.new(token)
+    end
+
     def set_token(token)
       @token = token
     end

data/lib/parsing/parser.rb

@@ -138,8 +138,16 @@ module TSqlParser::Parsing
       Keyword.get_new_node_keywords.include? s.upcase
     end
 
+    def self.is_new_node_composite?(s, next_s)
+      ["INNER JOIN", "LEFT JOIN", "RIGHT JOIN", "ELSE IF"].include? "#{s} #{next_s}"
+    end
+
     def self.is_terminator?(s)
       s == ";"
     end
+
+    def self.is_label?(s)
+      s.end_with? ":"
+    end
   end
 end

data/lib/parsing/text_formatter.rb

@@ -181,12 +181,7 @@ module TSqlParser::Parsing
 
     def self.format_update(s, tab_count = 0, tab = "    ")
       return s if s.nil?
-      formatted = []
-      parts = s.split(" SET ")
-      table = parts[0]
-      formatted << "\n#{tab * (tab_count + 1)}#{table}"
-      formatted << "#{tab * tab_count}SET #{parts[1]}"
-      formatted.join("\n")
+      "\n#{tab * (tab_count + 1)}#{s}"
     end
 
     def self.format_insert(s, tab_count = 0, tab = "    ")
@@ -200,7 +195,11 @@ module TSqlParser::Parsing
         formatted << "\n#{tab * (tab_count + 1)}#{table}"
         formatted << "#{tab * (tab_count + 2)}(#{columns})"
         formatted << "#{tab * (tab_count + 1)}VALUES"
-        formatted << "#{tab * (tab_count + 2)}(#{values})"
+        if s.end_with? ");"
+          formatted << "#{tab * (tab_count + 2)}(#{values}"
+        else
+          formatted << "#{tab * (tab_count + 2)}(#{values})"
+        end
       end
       formatted.join("\n") unless formatted.empty?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tsql_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Scott Stauffer