tsql_parser 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f673c238a4d2ba62893cc40d1b9cba39ec670d89637dcbf414cc25d72ff796
-  data.tar.gz: f08c8c2f290a5c66193ab8afa2c9e17095f801bb8d3793af09919e11f379c7e5
+  metadata.gz: 952e888020ea34386901d0476d96b7ae3520ec13bf4414e27bf65da4ca3d22e6
+  data.tar.gz: 5da27fe2eaa080678b73957c48af3702f504fa1126bec5668e501a443b6fed6b
 SHA512:
-  metadata.gz: e71435ffd85aea0165c31b32f38c685daa3f2057dbb2b123628eb5b54b077836f679c5792580277997321da7514c5ffcb0f3c7a567a75d20a91de65609dae5d7
-  data.tar.gz: c309fa288ffdeb797c7807293846fb641e49ae9c3cdc043cdedf9acd7823bb2d66c831d1212a38c17fb9c5961f6210213a696d3f694729d216e826ee82ff9d8e
+  metadata.gz: 22eb4777b4f9f716cb7e2bc158836e01fac84cbd007e1bc8be0e1bd8e6ca09c2ed1263af56d332f08ef806124e4681d23899a222178fcd441fa76865730ff755
+  data.tar.gz: 3e4c144c0b7e98c0bb909297cd0350e92a91762ff920a7801d3b6f451ec25b1f810b27cf2799619a68a7a55c55ea7efa84837faa916a242a878185b6371c4ead

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

@@ -23,8 +23,13 @@ module TSqlParser::Parsing::Formatters
       lines = text.split("\n")
       wait = false
       set_lines = []
+      special_set_keywords = %w[ANSI_DEFAULTS ANSI_NULL_DFLT_OFF ANSI_NULL_DFLT_ON ANSI_NULLS ANSI_PADDING ANSI_WARNINGS ARITHABORT ARITHIGNORE CONCAT_NULL_YIELDS_NULL CURSOR_CLOSE_ON_COMMIT DATEFIRST DATEFORMAT DEADLOCK_PRIORITY FIPS_FLAGGER FMTONLY FORCEPLAN IDENTITY_INSERT IMPLICIT_TRANSACTIONS LANGUAGE LOCK_TIMEOUT NOCOUNT NOEXEC NUMERIC_ROUNDABORT OFFSETS PARSEONLY QUERY_GOVERNOR_COST_LIMIT QUOTED_IDENTIFIER REMOTE_PROC_TRANSACTIONS ROWCOUNT SHOWPLAN_ALL SHOWPLAN_TEXT SHOWPLAN_XML STATISTICS TEXTSIZE TRANSACTION XACT_ABORT]
+
       lines.each do |line|
-        first = line.strip.split(" ").first
+        tokens = line.strip.split(" ")
+        first = tokens.first
+        next_token = tokens[1] if tokens.size > 1
+
         if %w[FROM WHERE].include? first and wait
           wait = false
           tab_count = self.get_tab_count(line, tab)
@@ -42,9 +47,14 @@ module TSqlParser::Parsing::Formatters
           next
         end
 
-        if first == "SET" and not line.strip.start_with? "SET @" and not %w[ON OFF].include? line.strip.split(" ").last
-          wait = true
-          set_lines << line
+        if first == "SET" and not line.strip.start_with? "SET @"
+          if not next_token.nil? and not special_set_keywords.include? next_token
+            wait = true
+            set_lines << line
+          else
+            formatted << line
+            formatted << ""
+          end
         elsif first != "SET" and line.include? " SET "
           parts = line.strip.split(" SET ")
           tab_count = self.get_tab_count(line, tab)
@@ -97,8 +107,8 @@ module TSqlParser::Parsing::Formatters
             builder = ""
           end
         elsif c == "\n"
-          parts << builder unless builder.empty?
-          builder = ""
+          #parts << builder unless builder.empty?
+          #builder = ""
         elsif c == "-"
           if next_c == "-"
             comment = true
@@ -114,7 +124,7 @@ module TSqlParser::Parsing::Formatters
       end
       parts << builder unless builder.empty?
       parts = parts.map { |p| p.strip }.select { |p| not p.empty? }
-      "\n#{parts.map { |p| "#{tab * (tab_count + 1)}#{p.strip}" }.join(",\n")}"
+      "\n#{parts.map { |p| "#{tab * (tab_count + 1)}#{p.strip.gsub(tab, " ")}" }.join(",\n")}"
     end
   end
 end

data/lib/parsing/tokenizer.rb

@@ -94,7 +94,7 @@ module TSqlParser::Parsing
           next
         end
 
-        if Parser.is_comment_start?(c, next_c)
+        if Parser.is_comment_start?(c, next_c) and not comment
           comment = true
           skip_count = 1
           specific_tokens << builder unless builder.empty?

metadata

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