scheman 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e73fa1b30a5a2616d7b7a44c8b3b2dfd750e3d9
-  data.tar.gz: dba7df4899f8acaf89b4f55bd611403c773e0768
+  metadata.gz: 13a488256dda03bd9e7c75477ab532b805ba3491
+  data.tar.gz: c4f69982678f0427156d0d127f7fcdc0eaa9f5d6
 SHA512:
-  metadata.gz: 4830bd819919bfb956a0b17a1068300071ba6e1974ac09ee4e9cfd03980043fa80630214f742f91218e8ec107843244d3fd55ba0396d0fe653c1322c4b7adb6d
-  data.tar.gz: 84543f84774b5ca849df3689d3738b1b89465d14a22ca2d30e32a6e35b4ea17155a71e79073f01ae4b45976f9d4cab8cdb3764d79d594fbfd98ad476df56048f
+  metadata.gz: 7c2b41f51bf2f871e20e045c4f4828f292cdf288e4c5f2c8f4697b7a34950d16f05c9529d2f72ba8808f2afca3c3949c5b4b92fa254c4ddb3fb9da2d68d5f9cf
+  data.tar.gz: 474496316452b1eb06fd78ff64cdd445dac31c75138d8beb9683c3b107cabfd4849d3a35052959575f51571e7138786c9b87d0ed228f62b24a29cd0c3b02e574

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.3
+* Support DEFAULT field qualifier
+
 ## 0.0.2
 * Support ADD INDEX
 * Support DROP INDEX

data/README.md

@@ -9,7 +9,8 @@ require "scheman"
 
 before = <<-SQL
 CREATE TABLE `table1` (
-  `column1` INTEGER(11) PRIMARY KEY NOT NULL AUTO INCREMENT
+  `column1` INTEGER(11) PRIMARY KEY NOT NULL AUTO INCREMENT,
+  `column2` DATETIME DEFAULT NOW()
 );
 
 CREATE TABLE `table2` (
@@ -21,7 +22,8 @@ SQL
 after = <<-SQL
 CREATE TABLE `table1` (
   `column1` CHAR(11) NOT NULL AUTO INCREMENT,
-  `column2` VARCHAR(255) NOT NULL,
+  `column2` DATETIME DEFAULT CURRENT_TIMESTAMP(),
+  `column3` VARCHAR(255) NOT NULL DEFAULT "a",
   PRIMARY KEY (`column2`)
 );
 
@@ -46,7 +48,7 @@ CREATE TABLE `table3` (
   PRIMARY KEY (`column1`)
 );
 
-ALTER TABLE `table1` ADD COLUMN `column2` VARCHAR(255) NOT NULL,
+ALTER TABLE `table1` ADD COLUMN `column3` VARCHAR(255) NOT NULL DEFAULT "a",
   CHANGE COLUMN `column1` CHAR(11) NOT NULL AUTO INCREMENT,
   DROP PRIMARY KEY,
   ADD PRIMARY KEY `column2`;

data/lib/scheman/diff.rb

@@ -75,9 +75,11 @@ module Scheman
         if before_table = before_schema.tables_indexed_by_name[after_table.name]
           after_table.fields.each do |after_field|
             if before_field = before_table.fields_indexed_by_name[after_field.name]
-              result << {
-                alter_field: after_field.to_hash.merge(table_name: after_table.name),
-              }
+              if after_field != before_field
+                result << {
+                  alter_field: after_field.to_hash.merge(table_name: after_table.name),
+                }
+              end
             end
           end
         end

data/lib/scheman/parsers/mysql.rb

@@ -99,6 +99,33 @@ module Scheman
           spaces.maybe
         end
 
+        rule(:string) do
+          (
+            single_quoted(
+              (
+                (str('\\') >> match('.')) |
+                  str("''") |
+                  match('[^\\\']')
+              ).repeat
+            ) | double_quoted(
+              (
+                (str('\\') >> match('.')) |
+                  str('""') |
+                  match('[^\\\"]')
+              ).repeat
+            )
+          ).as(:string)
+        end
+
+        rule(:bit) do
+          (
+            str("b") >> (
+              single_quoted(match("0|1").repeat(1, 64)) |
+                double_quoted(match("0|1").repeat(1, 64))
+            )
+          ).as(:bit)
+        end
+
         rule(:delimiter) do
           str(";")
         end
@@ -107,10 +134,6 @@ module Scheman
           spaces >> match('[\S]').repeat >> spaces
         end
 
-        rule(:string) do
-          any.repeat(1)
-        end
-
         rule(:eol) do
           delimiter >> spaces?
         end
@@ -258,7 +281,7 @@ module Scheman
           (field_qualifier >> (spaces >> field_qualifier).repeat)
         end
 
-        # TODO: default value, on update
+        # TODO: on update
         rule(:field_qualifier) do
           not_null_qualifier |
             null_qualifier |
@@ -266,7 +289,26 @@ module Scheman
             auto_increment_qualifier |
             character_set_qualifier |
             collate_qualifier |
-            unique_key_qualifier
+            unique_key_qualifier |
+            default_qualifier
+        end
+
+        rule(:default_qualifier) do
+          (
+            case_insensitive_str("default") >> spaces >> default_value
+          ).as(:default_qualifier)
+        end
+
+        rule(:default_value) do
+          (current_timestamp | string | bit | unclassified_default_value).as(:default_value)
+        end
+
+        rule(:unclassified_default_value) do
+          (match('[\w\d:.-]')).repeat(1).as(:unclassified_default_value)
+        end
+
+        rule(:current_timestamp) do
+          (case_insensitive_str("current_timestamp()") | case_insensitive_str("now()")).as(:current_timestamp)
         end
 
         rule(:unique_key_qualifier) do
@@ -441,6 +483,28 @@ module Scheman
           identifier.to_s
         end
 
+        rule(string: simple(:value)) do
+          {
+            type: "string",
+            value: value.to_s[1..-2],
+          }
+        end
+
+        rule(bit: simple(:value)) do
+          {
+            type: "bit",
+            value: value.to_s[2..-2].to_i(2),
+          }
+        end
+
+
+        rule(unclassified_default_value: simple(:value)) do
+          {
+            type: "unclassified",
+            value: value.to_s,
+          }
+        end
+
         rule(field_value: simple(:field_value)) do
           field_value.to_s
         end
@@ -529,6 +593,21 @@ module Scheman
           }
         end
 
+        rule(default_qualifier: subtree(:tree)) do
+          {
+            type: "default",
+            value: tree,
+          }
+        end
+
+        # @note We use Symbol to distinguish from string value
+        rule(current_timestamp: simple(:current_timestamp)) do
+          {
+            type: "current_timestamp",
+            value: nil,
+          }
+        end
+
         rule(database_name: simple(:database_name)) do
           {
             database_name: database_name.to_s,

data/lib/scheman/schema.rb

@@ -105,7 +105,7 @@ module Scheman
       # @note Size can be 2 values but not supported yet
       # @return [String, nil]
       def size
-        field[:size]
+        @field[:size]
       end
 
       # @return [Array<Hash>] Sorted qualifiers, without index-related types

data/lib/scheman/version.rb

@@ -1,3 +1,3 @@
 module Scheman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/scheman/views/mysql.rb

@@ -79,6 +79,10 @@ module Scheman
         rule(drop_index: subtree(:drop_index)) do
           DropIndex.new(drop_index)
         end
+
+        rule(default_value: subtree(:tree)) do
+          DefaultValue.new(tree)
+        end
       end
 
       class Node
@@ -344,6 +348,19 @@ module Scheman
           end
         end
       end
+
+      class DefaultValue < Node
+        def to_s
+          case @element[:type]
+          when "string"
+            @element[:value].inspect
+          when "current_timestamp"
+            "CURRENT_TIMESTAMP()"
+          else
+            @element[:value]
+          end
+        end
+      end
     end
   end
 end

data/spec/scheman/diff_spec.rb

@@ -20,7 +20,8 @@ describe Scheman::Diff do
   let(:before_schema) do
     <<-EOS.strip_heredoc
       CREATE TABLE `table1` (
-        `column1` INTEGER(11) PRIMARY KEY NOT NULL AUTO INCREMENT
+        `column1` INTEGER(11) PRIMARY KEY NOT NULL AUTO INCREMENT,
+        `column2` DATETIME DEFAULT NOW()
       );
 
       CREATE TABLE `table2` (
@@ -34,7 +35,8 @@ describe Scheman::Diff do
     <<-EOS.strip_heredoc
       CREATE TABLE `table1` (
         `column1` CHAR(11) NOT NULL AUTO INCREMENT,
-        `column2` VARCHAR(255) NOT NULL,
+        `column2` DATETIME DEFAULT CURRENT_TIMESTAMP(),
+        `column3` VARCHAR(255) NOT NULL DEFAULT "a",
         PRIMARY KEY (`column2`)
       );
 
@@ -61,7 +63,7 @@ describe Scheman::Diff do
           PRIMARY KEY (`column1`)
         );
 
-        ALTER TABLE `table1` ADD COLUMN `column2` VARCHAR(255) NOT NULL,
+        ALTER TABLE `table1` ADD COLUMN `column3` VARCHAR(255) NOT NULL DEFAULT "a",
           CHANGE COLUMN `column1` CHAR(11) NOT NULL AUTO INCREMENT,
           DROP PRIMARY KEY,
           ADD PRIMARY KEY `column2`;

data/spec/scheman/parsers/mysql_spec.rb

@@ -241,6 +241,114 @@ describe Scheman::Parsers::Mysql do
       end
     end
 
+    context "with DEFAULT CURRENT_TIMESTAMP()" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER DEFAULT CURRENT_TIMESTAMP());"
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "current_timestamp",
+              value: nil,
+            },
+          },
+        }
+      end
+    end
+
+    context "with DEFAULT NOW()" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER DEFAULT NOW());"
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "current_timestamp",
+              value: nil,
+            },
+          },
+        }
+      end
+    end
+
+    context "with DEFAULT with double quoted value" do
+      let(:str) do
+        %<CREATE TABLE `table1` (`column1` INTEGER DEFAULT "a");>
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "string",
+              value: "a",
+            },
+          },
+        }
+      end
+    end
+
+    context "with DEFAULT with single quoted value" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER DEFAULT 'a');"
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "string",
+              value: "a",
+            },
+          },
+        }
+      end
+    end
+
+    context "with DEFAULT with bit value" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER DEFAULT b'1111');"
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "bit",
+              value: 15,
+            },
+          },
+        }
+      end
+    end
+
+    context "with DEFAULT with unclassified value" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER DEFAULT 0);"
+      end
+
+      it "succeeds in parse" do
+        subject[0][:create_table][:fields][0][:field][:qualifiers][0][:qualifier].should == {
+          type: "default",
+          value: {
+            default_value: {
+              type: "unclassified",
+              value: "0",
+            },
+          },
+        }
+      end
+    end
+
     context "with PRIMARY KEY" do
       let(:str) do
         <<-EOS.strip_heredoc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scheman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport