tsql_parser 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddacc151a5ff2930d1bf0e7501a53711503811c123fdcc1fa74a5e3926435c94
-  data.tar.gz: 3ac0fa643de5be751c55544bb2b226c8e8e5b062f56d8910db01f853c5400597
+  metadata.gz: 261c5aa051e63968deb877640c812121e3898cccdd71a60aebed350f7cbc2cd2
+  data.tar.gz: e15cae8c9e0616deafc9d0ccefd5e4414c2653e673722d1995d7b27c24ad114c
 SHA512:
-  metadata.gz: eb1cd578f4346f3ed104d5a177ee1f7a3d67f5030fa748df64a85156a364ad38e0efe0e9fc48770d5f216d5a0857c2d65250caee3e28974392fd864a47873227
-  data.tar.gz: ace5d1a98579b17d3b48447691c61c3a0d346a090ba5462b54c6fa44c5ea7da1093825b71a6fb9b28e51f5e93785915f8e358e895011c236bf7ca3121865a84e
+  metadata.gz: 508119aff4af84168665d355bbc154232a4a98d713728adcd18495435fdc39fdb8868cde5cbccb2e570fc7c587f92e295d137f04b3c765aa99945974723c516f
+  data.tar.gz: 3888919f8554c94e596f567ac085ecde9316b32244781b30600a1c6d1a4d0bd47cc6e824bbbf110b084fe4ed392fdf552d2f587f9075938a1881bc2ea623a049

data/lib/parsing/formatter.rb

@@ -48,7 +48,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,7 +64,7 @@ module TSqlParser::Parsing
       end
       sub_one = false
       work_lines = work_lines.flatten
-      last = ''
+      last = ""
       work_lines.each_with_index do |line, index|
         first = line.strip.split(" ").first
 
@@ -74,7 +74,7 @@ module TSqlParser::Parsing
         elsif %w[END GO FROM].include? first and last != "DELETE"
           tab_count -= 1 if tab_count > 0
           indented_lines << "#{tab * tab_count}#{line}"
-        elsif %w[IF].include? first 
+        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"

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
@@ -157,28 +157,30 @@ module TSqlParser::Parsing
     private
 
     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 = "    ")
+      return s if s.nil?
       formatted = []
       parts = s.split(" SET ")
       table = parts[0]
@@ -190,6 +192,7 @@ module TSqlParser::Parsing
     end
 
     def self.format_insert(s, tab_count = 0, tab = "    ")
+      return s if s.nil?
       formatted = []
       if s.include? ") VALUES ("
         tokens = s.split(") VALUES (")
@@ -205,11 +208,14 @@ module TSqlParser::Parsing
     end
 
     def self.format_select(s, tab_count = 0, tab = "    ")
+      return s if s.nil?
+
       tokens = s.split(", ")
       "\n#{tokens.map { |t| "#{tab * (tab_count + 1)}#{t}" }.join(",\n")}"
     end
 
     def self.format_predicate(s, tab_count = 0, tab = "    ")
+      return s if s.nil?
       indented = []
       formatted = []
       builder = []

metadata

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