tsql_parser 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 261c5aa051e63968deb877640c812121e3898cccdd71a60aebed350f7cbc2cd2
-  data.tar.gz: e15cae8c9e0616deafc9d0ccefd5e4414c2653e673722d1995d7b27c24ad114c
+  metadata.gz: 47f15eed54caa7c7f4c7525b27d302577ed8a07c3fce61b6af631ccc4bfbb3cc
+  data.tar.gz: 06ad8019af83fbb0679692eb0ef91b6ee0258cca4e1c79c924d034d0e537c7f7
 SHA512:
-  metadata.gz: 508119aff4af84168665d355bbc154232a4a98d713728adcd18495435fdc39fdb8868cde5cbccb2e570fc7c587f92e295d137f04b3c765aa99945974723c516f
-  data.tar.gz: 3888919f8554c94e596f567ac085ecde9316b32244781b30600a1c6d1a4d0bd47cc6e824bbbf110b084fe4ed392fdf552d2f587f9075938a1881bc2ea623a049
+  metadata.gz: 56978f16697970a06636ccb533f50bf0528199622724568eea071647dcba591c14baa6e05564846f876fc01d413a64f2fdcb2e3f3e2f5b81cdd7a6a2f5c11d76
+  data.tar.gz: 8c874fde5552f5e331d618b5e8ed427e8442cfbe513d3f43e59330c04298022637be9b821f7c6dce621368c9f2449b9ad878d28fc96f84ae17676a834cd3343a

data/lib/parsing/formatter.rb

@@ -65,29 +65,25 @@ module TSqlParser::Parsing
       sub_one = false
       work_lines = work_lines.flatten
       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/text_formatter.rb

@@ -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.3
+  version: 0.0.5
 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