tsql_parser 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4dde0372fc9ba584c66ef9f7515ee506e0feb922551eb7512fb29e5e60142df
-  data.tar.gz: 98374051fb7dc1d225eb228a36f69bfcdf3745bb3bb462f079b5cf56b3c804cb
+  metadata.gz: 9e811afa0fc437610f1466d197aae259f227095dfa7c2d8ebfc6022387984072
+  data.tar.gz: c903812e94a81e2ba40c37f514315e25b86731768af0ce3829ca95879cf98ae9
 SHA512:
-  metadata.gz: e7d9f42e40942a2c72c127babea562f021ed46dadc806d92a0a567f84c3f915beaaa9aaccc22efebdb3a165d8920ae6b6782135e75e7d6a9c851ed7c9d02d2a9
-  data.tar.gz: d7538fe063532844abb2d4d5f393420fe9d8b4832fe56d502a5366a22e4fa4054a93b15ac80f3ee9ec89a4f04708e20457cb993d82fc9d94830a3eb4e8d99602
+  metadata.gz: d6b6cd6ccaf82f4267b5028c053f98e6f0960a3a88110d9b623cc3ddc4e770392fb452e7d9fa78126071d89aa742102ecd0e1e49b7030d830c5d39cc6bb49d3a
+  data.tar.gz: a4ed89d5d67b03a7128a102a28edfe2b9b5b46bc115e25e83c14293314170e2cfa3f1c8e5bd182f967aad786c1aabd9d40f7f2c172e097c68a75a33d67d6b417

data/lib/parsing/formatter.rb

@@ -25,14 +25,15 @@ module TSqlParser::Parsing
       lines = TokenTransformer.transform(tokens)
       lines = self.cleanup_whitespace(lines)
       lines = self.insert_indentation(lines, tab_count, tab)
-      #lines = self.insert_newlines(lines)
       text = lines.join("\n")
-      text = TextFormatter.new(JOIN, text, tab).format
-      text = TextFormatter.new(INSERT, text, tab).format
-      text = TextFormatter.new(UPDATE, text, tab).format
-      text = TextFormatter.new(WHERE, text, tab).format
-      text = TextFormatter.new(SELECT, text, tab).format
-      text = TextFormatter.new(SET, text, tab).format
+      text = TextFormatter.new(CTE, text, tab).format
+      text = TextFormatter.new(WHERE, text, tab).format if text.include? " WHERE "
+      text = TextFormatter.new(FROM, text, tab).format if text.include? " FROM "
+      text = TextFormatter.new(SELECT, text, tab).format if text.include? " SELECT "
+      text = TextFormatter.new(SET, text, tab).format if text.include? " SET "
+      text = TextFormatter.new(UPDATE, text, tab).format if text.include? " UPDATE "
+      text = TextFormatter.new(JOIN, text, tab).format if text.include? " JOIN "
+      text = TextFormatter.new(INSERT, text, tab).format if text.include? " INSERT "
       text
     end
 

data/lib/parsing/formatters/format_factory.rb

@@ -26,6 +26,7 @@ module TSqlParser::Parsing
             when SET then Formatters::SetFormatter.new
             when UPDATE then Formatters::UpdateFormatter.new
             when WHERE then Formatters::WhereFormatter.new
+            when FROM then Formatters::FromFormatter.new
             end
         end
     end

data/lib/parsing/formatters/strategy/__formatters.rb

@@ -20,6 +20,7 @@ module TSqlParser::Parsing
   require_relative "select_formatter"
   require_relative "update_formatter"
   require_relative "where_formatter"
+  require_relative "from_formatter"
 
   CTE = 0
   INSERT = 1
@@ -28,4 +29,5 @@ module TSqlParser::Parsing
   SET = 4
   UPDATE = 5
   WHERE = 6
+  FROM = 7
 end

data/lib/parsing/formatters/strategy/cte_formatter.rb

@@ -19,6 +19,34 @@ module TSqlParser::Parsing::Formatters
 
     class CommonTableExpressionFormatter < BaseFormatter
       def format(text, tab = Defaults.get_default_tab)
+        formatted = []
+        lines = text.split("\n")
+        lines.each_with_index do |line, index|
+          clean_line = line.strip
+          tab_count = self.get_tab_count(line, tab)
+          if clean_line.include? " AS (SELECT "
+            if clean_line.start_with? "WITH" and clean_line.end_with? ")"
+              cte_parts = clean_line.split(" AS (SELECT ")
+              cte_name = cte_parts[0]
+              cte_body = "AS (\n#{tab * (tab_count + 1)}SELECT #{cte_parts[1][..-2]}\n#{tab * tab_count})"
+              formatted << "#{tab * tab_count}#{cte_name} #{cte_body}"
+            elsif clean_line.end_with? ") ,"
+              cte_parts = clean_line.split(" AS (SELECT ")
+              cte_name = cte_parts[0]
+              cte_body = "AS (\n#{tab * (tab_count + 1)}SELECT #{cte_parts[1].sub(") ,", "")}\n#{tab * tab_count}),"
+              formatted << "#{tab * tab_count}#{cte_name} #{cte_body}"
+            elsif clean_line.end_with? ")"
+              cte_parts = clean_line.split(" AS (SELECT ")
+              cte_name = cte_parts[0]
+              cte_body = "AS (\n#{tab * (tab_count + 1)}SELECT #{cte_parts[1][..-2]}\n#{tab * tab_count})"
+              formatted << "#{tab * tab_count}#{cte_name} #{cte_body}"
+            end
+          else
+            formatted << line
+          end
+        end
+
+        formatted.join("\n")
       end
     end
   end

data/lib/parsing/formatters/strategy/from_formatter.rb

@@ -0,0 +1,46 @@
+#   __               .__
+# _/  |_  ___________|  |           ___________ _______  ______ ___________
+# \   __\/  ___/ ____/  |    ______ \____ \__  \\_  __ \/  ___// __ \_  __ \
+#  |  |  \___ < <_|  |  |__ /_____/ |  |_> > __ \|  | \/\___ \\  ___/|  | \/
+#  |__| /____  >__   |____/         |   __(____  /__|  /____  >\___  >__|
+#            \/   |__|              |__|       \/           \/     \/
+#
+# A very light-weight and opinionated T-SQL parser and formatter.
+#
+# github.com/scstauf
+#
+# path:
+#   parsing/formatters/from_formatter.rb
+# object:
+#   TSqlParser::Parsing::Formatters::FromFormatter
+
+module TSqlParser::Parsing::Formatters
+    require_relative "base_formatter"
+
+    class FromFormatter < BaseFormatter
+      def format(text, tab = Defaults.get_default_tab)
+        formatted = []
+        lines = text.split("\n")
+        lines.each_with_index do |line, index|
+            if line.strip.start_with? "--" or line.strip.start_with? "/*" or line.strip.end_with? "'"
+                formatted << line
+                next
+            end
+
+            if line.include? " FROM " and not line.include? " EXISTS ("
+                tab_count = self.get_tab_count(line, tab)
+                if line.count(" FROM ") == 1
+                    from_parts = line.split(" FROM ")
+                    formatted << "#{from_parts[0]}\n#{tab * tab_count}FROM #{from_parts[1]}"
+                else
+                    formatted << line[..line.index(" FROM ") - 1]
+                    formatted << "#{tab * tab_count}#{line[line.index(" FROM ") + 1..]}"
+                end
+            else
+                formatted << line
+            end
+        end
+        formatted.join("\n")
+      end
+    end
+end

data/lib/parsing/formatters/strategy/insert_formatter.rb

@@ -24,6 +24,7 @@ module TSqlParser::Parsing::Formatters
       search = "INSERT INTO"
       lines.each do |line|
         first = line.strip.split(" ").first
+        next if first.nil?
         if first != "INSERT"
           formatted << line
           next

data/lib/parsing/formatters/strategy/join_formatter.rb

@@ -28,13 +28,17 @@ module TSqlParser::Parsing::Formatters
 
       lines.each do |line|
         first = line.strip.split(" ").first
-        if line.include? " WHERE " and first != "WHERE" and not first.start_with? "--" and not first.start_with? "/*" and not line.strip.end_with? "'"
-          tab_count = self.get_tab_count(line, tab)
-          where_parts = line.strip.split(" WHERE ")
-          where_text = []
-          where_text << "#{tab * tab_count}#{where_parts[0]}"
-          where_text << "#{tab * tab_count}WHERE #{where_parts[1]}"
-          new_text << where_text.join("\n")
+        next if first.nil?
+
+        if first.start_with? "--" or first.start_with? "/*" or line.strip.end_with? "'"
+          new_text << line
+          next
+        end
+
+        tab_count = self.get_tab_count(line, tab)
+
+        if line.include? " JOIN "
+          new_text << self.format_joins(line, tab, tab_count)
         else
           new_text << line
         end
@@ -42,5 +46,50 @@ module TSqlParser::Parsing::Formatters
 
       new_text.join("\n")
     end
+
+    private
+
+    def format_joins(line, tab, tab_count)
+      formatted = []
+      builder = []
+      tokens = line.strip.split(" ")
+      skip_count = 0
+      tokens.each_with_index do |t, i|
+        if skip_count > 0
+          skip_count -= 1
+          next
+        end
+
+        last_one = tokens[i - 1] if i - 1 > 0
+        future_one = tokens[i + 1] if i + 1 < tokens.size
+        future_two = tokens[i + 2] if i + 2 < tokens.size
+        future_three = tokens[i + 3] if i + 3 < tokens.size
+
+        next_two = "#{future_one} #{future_two}"
+        next_three = "#{future_one} #{future_two} #{future_three}"
+
+        if ["INNER JOIN", "LEFT JOIN", "RIGHT JOIN", "FULL JOIN", "CROSS JOIN"].include? next_two
+          builder << t
+          formatted << "#{tab * tab_count}#{builder.join(" ")}" unless builder.empty?
+          builder = [next_two]
+          skip_count = 2
+        elsif ["LEFT OUTER JOIN", "RIGHT OUTER JOIN", "FULL OUTER JOIN"].include? next_three
+          builder << t
+          formatted << "#{tab * tab_count}#{builder.join(" ")}" unless builder.empty?
+          builder = [next_three]
+          skip_count = 3
+        elsif t == "JOIN" and (not last_one.nil? and not %w[INNER LEFT RIGHT FULL CROSS OUTER].include? last_one)
+          formatted << "#{tab * tab_count}#{builder.join(" ")}" unless builder.empty?
+          builder = [t]
+        else
+          builder << t
+        end
+      end
+      
+      formatted << "#{tab * tab_count}#{builder.join(" ")}" unless builder.empty?
+      builder = []
+
+      formatted.join("\n")
+    end
   end
 end

data/lib/parsing/formatters/strategy/select_formatter.rb

@@ -23,6 +23,8 @@ module TSqlParser::Parsing::Formatters
       lines = text.split("\n")
       lines.each do |line|
         first = line.strip.split(" ").first
+        next if first.nil?
+
         if first != "SELECT"
           formatted << line
           next
@@ -45,8 +47,31 @@ module TSqlParser::Parsing::Formatters
     def format_select(s, tab_count = Defaults.get_default_tab_count, tab = Defaults.get_default_tab)
       return s if s.nil?
 
-      tokens = s.split(", ")
-      "\n#{tokens.map { |t| "#{tab * (tab_count + 1)}#{t}" }.join(",\n")}"
+      new_tokens = []
+      parenthesis = 0
+      builder = ""
+      skip_count = 0
+      s.split("").each do |c|
+        parenthesis += 1 if c == "("
+        parenthesis -= 1 if c == ")"
+
+        if skip_count > 0
+          skip_count -= 1
+          next
+        end
+
+        if c == "," and parenthesis == 0
+          new_tokens << builder unless builder.empty?
+          builder = ""
+          skip_count = 1
+        else
+          builder += c
+        end
+      end
+
+      new_tokens << builder unless builder.empty?
+
+      "\n#{new_tokens.map { |t| "#{tab * (tab_count + 1)}#{t}" }.join(",\n")}"
     end
   end
 end

data/lib/parsing/formatters/strategy/set_formatter.rb

@@ -28,6 +28,7 @@ module TSqlParser::Parsing::Formatters
       lines.each do |line|
         tokens = line.strip.split(" ")
         first = tokens.first
+        next if first.nil?
         next_token = tokens[1] if tokens.size > 1
 
         if %w[FROM WHERE].include? first and wait
@@ -59,7 +60,7 @@ module TSqlParser::Parsing::Formatters
           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 #{self.format_set(p, tab_count, tab)}" }
         elsif wait
           set_lines << line
         else

data/lib/parsing/formatters/strategy/update_formatter.rb

@@ -23,6 +23,8 @@ module TSqlParser::Parsing::Formatters
       lines = text.split("\n")
       lines.each do |line|
         first = line.strip.split(" ").first
+        next if first.nil?
+
         if first != "UPDATE"
           formatted << line
           next
@@ -35,7 +37,7 @@ module TSqlParser::Parsing::Formatters
           formatted << line
           next
         end
-        formatted << line.sub(update, new_update)
+        formatted << "#{tab * tab_count}#{line.strip.sub(update, new_update)}"
       end
       formatted.join("\n")
     end

data/lib/parsing/formatters/strategy/where_formatter.rb

@@ -22,19 +22,27 @@ module TSqlParser::Parsing::Formatters
       formatted = []
       text.split("\n").each do |line|
         first = line.strip.split(" ").first
-        if first != "WHERE"
+        next if first.nil?
+        if not line.include? "WHERE"
           formatted << line
           next
         end
 
+        if line.strip.start_with? "--" or line.strip.start_with? "/*" or line.strip.end_with? "'"
+          formatted << line
+          next
+        end
+
+        where_clause = line[line.index(" WHERE ")..].strip
+
         tab_count = self.get_tab_count(line, tab)
-        predicate = line.strip[first.size + 1..]
+        predicate = where_clause.strip["WHERE".size + 1..]
         new_predicate = self.format_predicate(predicate, tab_count, tab)
         if new_predicate.nil?
           formatted << line
           next
         end
-        formatted << line.sub(predicate, new_predicate)
+        formatted << line.sub("WHERE", "").sub(predicate, "\n#{tab * tab_count}WHERE#{new_predicate}")
       end
 
       formatted.join("\n")

data/lib/parsing/tokenizer.rb

@@ -25,6 +25,7 @@ module TSqlParser::Parsing
 
     def basic_tokenize(tsql_string)
       self.reset
+      tsql_string = tsql_string.gsub("\t", Defaults.get_default_tab)
       tsql_chars = tsql_string.split("")
 
       tsql_chars.each_with_index do |c, i|
@@ -64,7 +65,7 @@ module TSqlParser::Parsing
     def handle_multicomment_start
       if Parser.is_multiline_comment_start?(@c, @next_c)
         @multiline_comment = true
-        self.flush_builder(c)
+        self.flush_builder(@c)
         return true
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tsql_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Scott Stauffer
@@ -10,8 +10,10 @@ bindir: bin
 cert_chain: []
 date: 2023-04-03 00:00:00.000000000 Z
 dependencies: []
-description: A very light-weight and opinionated T-SQL parser and formatter. Github
-  has the most recent docs.
+description: |-
+  A very light-weight and opinionated T-SQL parser and formatter.
+  Github has the most recent docs.
+  Contributions welcome!
 email: scott@fuseraft.com
 executables: []
 extensions: []
@@ -24,6 +26,7 @@ files:
 - lib/parsing/formatters/strategy/__formatters.rb
 - lib/parsing/formatters/strategy/base_formatter.rb
 - lib/parsing/formatters/strategy/cte_formatter.rb
+- lib/parsing/formatters/strategy/from_formatter.rb
 - lib/parsing/formatters/strategy/insert_formatter.rb
 - lib/parsing/formatters/strategy/join_formatter.rb
 - lib/parsing/formatters/strategy/select_formatter.rb