scheman 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc602f3aa02ac3f06f48d632a05ffa7f7784fd7
-  data.tar.gz: f44bbc67da9d9bae8e12ff783d186f305e355181
+  metadata.gz: 0f5b2dcdccc0eb4557f8afddd786c3510a4c05d2
+  data.tar.gz: 780b979f8c674c9234c59ee6df494875a206049a
 SHA512:
-  metadata.gz: acd3b64fdcd250a3af7883586527239f115ac5104e5f236baed6cd366dffc7984336ffaa1afb7f94dadfd7881b2c534418c5b06c72c1674945d86389ed9a1aa7
-  data.tar.gz: bfe6787b4b0b10ec11ff296c72cf1157a191856611a35b7e2d9dc48830958cb70769a173faf877ead5b222b1b7f7f869084b52754a9573aeae2c8383454dd8cb
+  metadata.gz: 9b00cc8f5fc5e3c3dd432c6ab5bd5550843a78bce588266a54af2097e2fb70cb0f295cd8c794fae09c2586a4ae1e683a77baeb59ea976145093a97fead9cf03e
+  data.tar.gz: b4903ed2d840c631f1ad2eefbf89acae9ba4d3bcf961078ed45e81c0443134d27807e30ca09a3c2b6887e94e1ef0557368a1b82196f14a47d1ef716a1b1e2017

data/CHANGELOG.md

@@ -1,17 +1,20 @@
+## 0.0.6
+- Treat commented out line as space node (Thx @yuki-takeichi)
+
 ## 0.0.5
-* Improve parser rule for CREATE TABLE (Thx @yuki-takeichi)
+- Improve parser rule for CREATE TABLE (Thx @yuki-takeichi)
 
 ## 0.0.4
-* Add `schema diff` command
-* Improve MySQL parser logic
+- Add `schema diff` command
+- Improve MySQL parser logic
 
 ## 0.0.3
-* Support DEFAULT column qualifier
+- Support DEFAULT column qualifier
 
 ## 0.0.2
-* Support ADD INDEX
-* Support DROP INDEX
-* Detect altered column
+- Support ADD INDEX
+- Support DROP INDEX
+- Detect altered column
 
 ## 0.0.1
-* 1st Release
+- 1st Release

data/lib/scheman/parsers/mysql.rb

@@ -89,7 +89,7 @@ module Scheman
         end
 
         rule(:space) do
-          match('\s')
+          match('\s') | comment
         end
 
         rule(:space?) do
@@ -222,7 +222,7 @@ module Scheman
         end
 
         rule(:create_definition) do
-          index | field | comment
+          index | field
         end
 
         rule(:index) do
@@ -297,12 +297,11 @@ module Scheman
 
         rule(:field) do
           (
-            comment.repeat >> field_name.as(:field_name) >> spaces >> field_type >>
+            field_name.as(:field_name) >> spaces >> field_type >>
               (spaces >> field_qualifiers).maybe.as(:field_qualifiers) >>
               (spaces >> field_comment).maybe >>
               (spaces >> reference_definition).maybe >>
-              (spaces >> on_update).maybe >>
-              comment.maybe
+              (spaces >> on_update).maybe
           ).as(:field)
         end
 

data/lib/scheman/version.rb

@@ -1,3 +1,3 @@
 module Scheman
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/scheman/parsers/mysql_spec.rb

@@ -564,5 +564,23 @@ describe Scheman::Parsers::Mysql do
         expect { subject }.not_to raise_error
       end
     end
+
+    context "with various comment outs" do
+      let(:str) do
+        <<-EOS.strip_heredoc
+          # comment
+          CREATE TABLE `table1` (
+            `column1` INTEGER(11) NOT NULL AUTO_INCREMENT,
+            -- `column1` VARCHAR(11) NOT NULL AUTO_INCREMENT,
+            `column2` VARCHAR(255)/* comment here! */NOT NULL,
+            PRIMARY KEY (`column1`)
+          ); -- comment out
+        EOS
+      end
+
+      it "succeeds in parse" do
+        expect { subject }.not_to raise_error
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scheman
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport