tsql_parser 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8b4d7afa83f298c53d2f34be1012948466a1dc17dfb022bc59a723e7558c84
-  data.tar.gz: 29154ff1736be248f22c84a3e985699b1b3c1eadca44295634a9c27dba4cd848
+  metadata.gz: 75691620d6ff57a073073f7438189fb9858a74f06737872ac0d38994fd9293ba
+  data.tar.gz: a5f2bdf884135c00ca792a0f6e8b321d5959295836072c5a9a182f641eced85e
 SHA512:
-  metadata.gz: 01de8daed01b64881f3f112dc2233ea2a3fe27ffddd3e95940ed353425b36a2b2ae5631661cd81faab998494992149be1bc20d1adbd6939305350e2e8e9ab03e
-  data.tar.gz: f3212645945c40035938a96664e3f6df3044716750e12874f0cf4d40424729cea5054d42bbeb3335be7b914b7a5fbd14fb29c158163a39344b0f956dfd09c6b4
+  metadata.gz: '058f424ea22ebcf1e84ce1dcd0dacec6360210ab145ef71946a30bd989b71463b373526aebe01ba1a0d0e42c3701c2ad42f1e14f8a993fe93ff68cecf4708745'
+  data.tar.gz: 1a405f6ae5c149dd653179979fa17f9db0fd64804e5ef60f6bfbc4d1e4521f526796aee807714619e1547019bc8aeebd3b248d05aaf7469d2f2d0e659f770610

data/lib/parsing/model/flat_sql_container.rb

@@ -18,12 +18,16 @@ module TSqlParser::Parsing
   class FlatSqlContainer
     def initialize(token = nil)
       @token = token
-      @children = []
       @siblings = []
 
       unless token.nil?
         if token.has_nodes?
           token.get_nodes.each do |n|
+            if n.get_token[:comment]
+              comment_token = n.get_token
+              comment_token[:value] = "#{comment_token[:value]}\n"
+              n.set_token comment_token
+            end
             @siblings << n
           end
         end
@@ -46,26 +50,14 @@ module TSqlParser::Parsing
       @siblings << token
     end
 
-    def add_child(token)
-      @children << SqlContainer.new(token)
-    end
-
     def has_siblings?
       @siblings.size > 0
     end
 
-    def has_children?
-      @children.size > 0
-    end
-
     def get_siblings
       @siblings
     end
 
-    def get_children
-      @children
-    end
-
     def get_token
       @token.get_token
     end

data/lib/parsing/text_formatter.rb

@@ -195,7 +195,11 @@ module TSqlParser::Parsing
         formatted << "\n#{tab * (tab_count + 1)}#{table}"
         formatted << "#{tab * (tab_count + 2)}(#{columns})"
         formatted << "#{tab * (tab_count + 1)}VALUES"
-        formatted << "#{tab * (tab_count + 2)}(#{values})"
+        if s.end_with? ");"
+          formatted << "#{tab * (tab_count + 2)}(#{values}"
+        else
+          formatted << "#{tab * (tab_count + 2)}(#{values})"
+        end
       end
       formatted.join("\n") unless formatted.empty?
     end

data/lib/parsing/tokenizer.rb

@@ -102,6 +102,17 @@ module TSqlParser::Parsing
           next
         end
 
+        if comment and c != "\n"
+          builder << c
+          next
+        elsif comment and c == "\n"
+          puts "comment builder: #{builder}"
+          specific_tokens << builder unless builder.empty?
+          builder = ""
+          comment = false
+          next
+        end
+
         if c == "'" and not multiline_comment and not comment
           if not string
             string = true
@@ -125,17 +136,7 @@ module TSqlParser::Parsing
           next
         end
 
-        if comment and c != "\n"
-          builder << c
-          next
-        elsif comment and c == "\n"
-          specific_tokens << builder unless builder.empty?
-          builder = ""
-          comment = false
-          next
-        end
-
-        if delimiters.include? c and !multiline_comment and !string
+        if delimiters.include? c and !multiline_comment and !string and !comment
           specific_tokens << builder unless builder.empty?
           specific_tokens << c unless skip_delimiters.include? c
           builder = ""

metadata

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