tsql_parser 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f0af056c66e37a5b5f541779ee7387fc5756884f5e2d302329f7c8b35b9bfe
-  data.tar.gz: e914e56c485ec9fc0e282f27734d36e17b8a16bb220a4288744f7e45ac263614
+  metadata.gz: 75691620d6ff57a073073f7438189fb9858a74f06737872ac0d38994fd9293ba
+  data.tar.gz: a5f2bdf884135c00ca792a0f6e8b321d5959295836072c5a9a182f641eced85e
 SHA512:
-  metadata.gz: 565804ec4625e5bde30d5ef68d52a44d98317a803f1e4e90dedbb13f0805906ed165f9b4ac972bad845d13a41d72926344c02c8cf30a17c6b2b537a8a85eab42
-  data.tar.gz: c52b196c627315e281b33f4b7cb20ed0ac11d7b0290a1ead14cb45feb71b4c165e7bdf87098f9ea1c36aaa2814be38adc35251313a90bc9731e5a1df2e827690
+  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/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.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Scott Stauffer