tsql_parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f673c238a4d2ba62893cc40d1b9cba39ec670d89637dcbf414cc25d72ff796
-  data.tar.gz: f08c8c2f290a5c66193ab8afa2c9e17095f801bb8d3793af09919e11f379c7e5
+  metadata.gz: 62f81b6f4b6195e663c823dbb1fda82a8a7530d534ed73a9ba27a048fdacb42d
+  data.tar.gz: c1af50b7c5421316290044ca548bd9983b568c8f6446402ba1d6b25ef46920ea
 SHA512:
-  metadata.gz: e71435ffd85aea0165c31b32f38c685daa3f2057dbb2b123628eb5b54b077836f679c5792580277997321da7514c5ffcb0f3c7a567a75d20a91de65609dae5d7
-  data.tar.gz: c309fa288ffdeb797c7807293846fb641e49ae9c3cdc043cdedf9acd7823bb2d66c831d1212a38c17fb9c5961f6210213a696d3f694729d216e826ee82ff9d8e
+  metadata.gz: 24c95e57e20af4b3dff6d7b15cb38e0736bddc683f025c9bc5300e6662992045e110990343497c13952524de2868fdc5341214ab744d6305416a2f001388d555
+  data.tar.gz: 06d257666a82067a42990e8c0f9a4ac8dd1644ec399f7f8aa453cfe7d2465dc680a349c7623bcf92e6f1f0d412a6a4ea2440f818bdf1b239510896b601e891cd

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)

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.2
 platform: ruby
 authors:
 - Scott Stauffer