tsql_parser 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b757cb7f1ee4f8b904d58f92dfe0c031a42e1c029c3fca2e9b9c276bc2c3954a
-  data.tar.gz: c0eb3a98483345e7a365800e400756c6bbdc7898d706f09f8759f17f044e0c06
+  metadata.gz: 140f30630a7230c26d92685df9096e1ca6580b5b7e912abc67f9080ae059d548
+  data.tar.gz: 5ab346dacef176ca728d6443ce76d91cdd8c924e2b72489312d4bf8fb61efe77
 SHA512:
-  metadata.gz: ca7f2b2f2c15d508bfddfa725ca8d979132c018e4b44fef321249329f55cc220cc8ca50b2dc2f414d17daf336ad97b6617ee6e28b5afde3a07f900f710e057cd
-  data.tar.gz: 46171055a31591de3ff362ebf14dc45bd819399ab3e5acffad9810499f9440f4da99eace839b1b775a966b8ea31982691fdad746597c345e2c6aca14a0229c85
+  metadata.gz: 0bcb94444e554501b9e926ff95149e749c62728bc2b6fed26012405d87b358ea93ea14a275b570c5d673f4d2a038b92fc0081ec0bef7e43253d760f352471f37
+  data.tar.gz: 83f4f5aa3d64ecc5cddbd33346b2cbd8d81376ca4efdfa895d928f5fe9abfa759718d97c5700566ad45a06ebd653dd31937f32acee0390ced841e082e40ae0fa

data/lib/parsing/formatter.rb

@@ -36,6 +36,7 @@ module TSqlParser::Parsing
       text = TextFormatter.format_selects(text, tab)
       text = TextFormatter.format_sets(text, tab)
       text
+      puts text
     end
 
     private
@@ -48,7 +49,7 @@ module TSqlParser::Parsing
           new_lines << ""
           next
         end
-        if %w[IF RETURN INSERT DELETE WHILE].include? first or first.start_with? "/*"
+        if Parser.is_newline_required? first or first.start_with? "/*"
           new_lines << ""
         end
         new_lines << line
@@ -64,30 +65,26 @@ module TSqlParser::Parsing
       end
       sub_one = false
       work_lines = work_lines.flatten
-      last = ''
+      last = ""
+      in_if_exists = false
       work_lines.each_with_index do |line, index|
         first = line.strip.split(" ").first
+        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"
           indented_lines << "#{tab * tab_count}#{line}"
           tab_count += 1
-        elsif %w[END GO FROM].include? first and last != "DELETE"
+        elsif %w[FROM END GO].include? first and not %w[DELETE UPDATE INSERT].include? last
           tab_count -= 1 if tab_count > 0
           indented_lines << "#{tab * tab_count}#{line}"
-        elsif %w[IF].include? first 
-          indented_lines << "#{tab * tab_count}#{line}"
-          next_line = work_lines[index + 1] unless index + 1 > work_lines.size
-          sub_one = true unless next_line.start_with? "BEGIN"
-          tab_count += 1 if sub_one
-          last = first
-          next
         else
           indented_lines << "#{tab * tab_count}#{line}"
         end
 
         if sub_one
           sub_one = false
-          tab_count -= 1
+          tab_count -= 1 if tab_count > 0
         end
         last = first
       end

data/lib/parsing/keyword.rb

@@ -25,7 +25,7 @@ module TSqlParser::Parsing
 
     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]
+        - %w[WHERE SET WITH]
     end
 
     def self.get_begin_keyword
@@ -45,7 +45,7 @@ module TSqlParser::Parsing
     end
 
     def self.get_newline_keywords
-      %w[INSERT UPDATE DELETE SELECT SET DECLARE CREATE FROM INNER FULL OUTER LEFT RIGHT CROSS JOIN IF BEGIN END RETURN WHERE PRINT GROUP ORDER WHILE]
+      %w[INSERT UPDATE DELETE SELECT CREATE IF RETURN PRINT WHILE]
     end
 
     def self.get_reserved_keywords

data/lib/parsing/text_formatter.rb

@@ -34,7 +34,7 @@ module TSqlParser::Parsing
           parts = line.strip.split(" SET ")
           tab_count = self.get_tab_count(line, tab)
           formatted << "#{tab * tab_count}#{parts[0]}\n"
-          parts[1..].each {|p| formatted << "#{tab * tab_count}SET #{p}" }
+          parts[1..].each { |p| formatted << "#{tab * tab_count}SET #{p}" }
         else
           formatted << line
         end
@@ -159,24 +159,24 @@ module TSqlParser::Parsing
     def self.format_set(s, tab_count = 0, tab = "    ")
       return s if s.nil?
       parts = []
-      builder = ''
+      builder = ""
       parenthesis = 0
-      s.split('').each do |c|
-        parenthesis += 1 if c == '('
-        parenthesis -= 1 if c == ')'
-        if c == ','
+      s.split("").each do |c|
+        parenthesis += 1 if c == "("
+        parenthesis -= 1 if c == ")"
+        if c == ","
           if parenthesis > 0
             builder << c
           else
             parts << builder
-            builder = ''
+            builder = ""
           end
         else
           builder << c
         end
       end
       parts << builder unless builder.empty?
-      "\n#{parts.map {|p| "#{tab * (tab_count + 1)}#{p.strip}"}.join(",\n")}"
+      "\n#{parts.map { |p| "#{tab * (tab_count + 1)}#{p.strip}" }.join(",\n")}"
     end
 
     def self.format_update(s, tab_count = 0, tab = "    ")
@@ -184,10 +184,8 @@ module TSqlParser::Parsing
       formatted = []
       parts = s.split(" SET ")
       table = parts[0]
-      where_parts = parts[1].split(" WHERE ")
       formatted << "\n#{tab * (tab_count + 1)}#{table}"
-      formatted << "#{tab * tab_count}SET #{where_parts[0]}"
-      formatted << "#{tab * tab_count}WHERE #{where_parts[1]}" if where_parts.size > 0
+      formatted << "#{tab * tab_count}SET #{parts[1]}"
       formatted.join("\n")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tsql_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Scott Stauffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies: []
 description: A very light-weight and opinionated T-SQL parser and formatter.
 email: scott@fuseraft.com