scheman 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456bdbc451ec84ddb6f377404e7654d2be2a9b8e
-  data.tar.gz: a3c758811636f4466abcc3fc82332931de0e8f69
+  metadata.gz: 2fc602f3aa02ac3f06f48d632a05ffa7f7784fd7
+  data.tar.gz: f44bbc67da9d9bae8e12ff783d186f305e355181
 SHA512:
-  metadata.gz: 6da8d574d687da3d0394e4944032daecdc47eb15421412f1f26e798c7db22b6426a2cf3655549acf7ee8a21e712f6d0519349f5e8c0c337df6c2bb47d7d9e54d
-  data.tar.gz: 88bf79baf57946a03352ec156882243ed3cfb05753cce7660a70e60057ab3beb27d41c5503f2da1eb68512611a2a2bde26611fc6736370f96cd72826575143d9
+  metadata.gz: acd3b64fdcd250a3af7883586527239f115ac5104e5f236baed6cd366dffc7984336ffaa1afb7f94dadfd7881b2c534418c5b06c72c1674945d86389ed9a1aa7
+  data.tar.gz: bfe6787b4b0b10ec11ff296c72cf1157a191856611a35b7e2d9dc48830958cb70769a173faf877ead5b222b1b7f7f869084b52754a9573aeae2c8383454dd8cb

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+- 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.5
+* Improve parser rule for CREATE TABLE (Thx @yuki-takeichi)
+
 ## 0.0.4
 * Add `schema diff` command
 * Improve MySQL parser logic

data/README.md

@@ -1,55 +1,50 @@
-# Scheman
+# Scheman [![Build Status](https://travis-ci.org/r7kamura/scheman.svg?branch=master)](https://travis-ci.org/r7kamura/scheman)
 SQL schema parser.
 
 ## Usage
-Create diff from 2 schema files.
+Create diff from 2 schema files or input.
 
-```ruby
-require "scheman"
-
-before = <<-SQL
+```sql
+# 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` (
-  `column1` INTEGER(11) NOT NULL AUTO INCREMENT,
+  `column1` INTEGER(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`column1`)
 );
-SQL
+```
 
-after = <<-SQL
+```sql
+# after.sql
 CREATE TABLE `table1` (
-  `column1` CHAR(11) NOT NULL AUTO INCREMENT,
+  `column1` CHAR(11) NOT NULL AUTO_INCREMENT,
   `column2` DATETIME DEFAULT CURRENT_TIMESTAMP(),
   `column3` VARCHAR(255) NOT NULL DEFAULT "a",
   PRIMARY KEY (`column2`)
 );
 
 CREATE TABLE `table3` (
-  `column1` INTEGER(11) NOT NULL AUTO INCREMENT,
+  `column1` INTEGER(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`column1`)
 );
-SQL
-
-puts Scheman::Diff.new(before: before, after: after, type: "mysql")
 ```
 
-The result would be the following:
-
-```sql
+```sh
+$ scheman diff --before before.sql --after after.sql
 BEGIN;
 
 SET foreign_key_checks=0;
 
 CREATE TABLE `table3` (
-  `column1` INTEGER(11) NOT NULL AUTO INCREMENT,
+  `column1` INTEGER(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`column1`)
 );
 
 ALTER TABLE `table1` ADD COLUMN `column3` VARCHAR(255) NOT NULL DEFAULT "a",
-  CHANGE COLUMN `column1` CHAR(11) NOT NULL AUTO INCREMENT,
+  CHANGE COLUMN `column1` CHAR(11) NOT NULL AUTO_INCREMENT,
   DROP PRIMARY KEY,
   ADD PRIMARY KEY `column2`;
 
@@ -59,3 +54,29 @@ SET foreign_key_checks=1;
 
 COMMIT;
 ```
+
+### STDIN
+You can input schema data into `scheman diff` command via STDIN, instead of --before.
+For instance, this interface is useful when you want to use `mysqldump` command to get your current schema.
+
+```sh
+$ mysqldump --no-data --compact db_name | scheman diff --after after.sql
+```
+
+### ./schema.sql
+Scheman use `./schema.sql` as a default value of --after option.
+
+```sh
+$ mysqldump --no-data --compact db_name | scheman diff
+```
+
+### Pipes
+Here is an example workflow of schema modification, using UNIX pipes.
+
+```sh
+$ vi schema.sql
+$ mysqldump --no-data --compact db_name | scheman diff | mysql db_name
+```
+
+### Rails
+[scheman-rails](https://github.com/r7kamura/scheman-rails) provides some rake tasks to use scheman with Rails.

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/scheman/parsers/mysql.rb

@@ -195,17 +195,17 @@ module Scheman
         end
 
         rule(:comment_table_option) do
-          case_insensitive_str("comment") >> spaces? >> str("=") >> spaces? >> single_quoted(match("[^']").repeat(1))
+          case_insensitive_str("comment") >> (spaces? >> str("=") >> spaces? | spaces) >> single_quoted(match("[^']").repeat(1))
         end
 
         rule(:charset_table_option) do
           case_insensitive_str("default ").maybe >>
             (case_insensitive_str("charset") | case_insensitive_str("character set")) >>
-            spaces? >> str("=") >> spaces? >> word
+            (spaces? >> str("=") >> spaces? | spaces) >> word
         end
 
         rule(:other_table_option) do
-          word >> spaces? >> str("=") >> spaces? >> (word | single_quoted(word) | double_quoted(word))
+          word >> (spaces? >> str("=") >> spaces? | spaces) >> (word | single_quoted(word) | double_quoted(word))
         end
 
         rule(:table_components) do
@@ -273,7 +273,7 @@ module Scheman
         end
 
         rule(:index_name) do
-          identifier.as(:index_name)
+          (quoted_identifier | identifier).as(:index_name)
         end
 
         # TODO: Fix spaces not to allow no space
@@ -403,7 +403,7 @@ module Scheman
         end
 
         rule(:column_name) do
-          quoted_identifier.as(:column_name)
+          (quoted_identifier | identifier).as(:column_name)
         end
 
         rule(:value) do
@@ -442,9 +442,7 @@ module Scheman
 
         rule(:quoted_identifier) do
           (
-            single_quoted(match("[^']").repeat(1)) |
-              double_quoted(match('[^"]').repeat(1)) |
-              back_quoted(match("[^`]").repeat(1))
+            back_quoted(match("[^`]").repeat(1))
           ).as(:quoted_identifier)
         end
 

data/lib/scheman/version.rb

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

data/spec/scheman/parsers/mysql_spec.rb

@@ -417,7 +417,7 @@ describe Scheman::Parsers::Mysql do
 
     context "with KEY" do
       let(:str) do
-        "CREATE TABLE `table1` (`column1` INTEGER, KEY index1 (`column1`));"
+        "CREATE TABLE `table1` (`column1` INTEGER, KEY `index1` (`column1`));"
       end
 
       it "succeeds in parse" do
@@ -554,5 +554,15 @@ describe Scheman::Parsers::Mysql do
         expect { subject }.not_to raise_error
       end
     end
+
+    context "'=' character is optional in create table options" do
+      let(:str) do
+        "CREATE TABLE `table1` (`column1` INTEGER) COMMENT 'hoge' ENGINE MyISAM DEFAULT CHARACTER SET latin1;"
+      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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: SQL schema parser.