flydata 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c1397fca1de7c4cb3382fcf4278e03de645693
-  data.tar.gz: 533850a6c296ca0df8ba934ec277e99b5b155bd2
+  metadata.gz: 0c8db01831bbe6064e91787631ec6bb0e943adcf
+  data.tar.gz: 9d2693f29f27ddc50606aad9092aa858e03aa794
 SHA512:
-  metadata.gz: 15180ce5c9fd332023fbaefb28dc290a144885d23e8e1bc1d12a542dadece366da16c8f6c2078f3c3b405db25010c67b2ad372ba8a4f8cc97ee59703828f351f
-  data.tar.gz: 4a1c28339d84a87d19304ca7a4e85239dbadbbdda4009a08a1d14add1af58c38238626042996524310a2f994891cacf195aaed06edc59c7ac6b38a80d336f143
+  metadata.gz: 1491e172b4e48f320eeea818e26dd78c6ab932686d12bd82fa1bea9bf9f65062802efa49ec83b4dc6384c0ee2a01aa0841ed13df8a0e96a802179711ea801e3c
+  data.tar.gz: c095c18ac4bda4be13c36a7cb03348e62b1fedde7bea01ff400b81e854516484910c8455d49be54f46881c6767215c5b9a62cbdb53b435e697f7093107cd8f7c

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/flydata.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: flydata 0.2.3 ruby lib
+# stub: flydata 0.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2014-09-16"
+  s.date = "2014-09-17"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["fdmysqldump", "flydata", "serverinfo"]

data/lib/flydata/parser/mysql/mysql_alter_table.treetop

@@ -202,8 +202,51 @@ grammar MysqlAlterTable
     'default'i sp default_value { def default_opt_option; { default: default_value.default_value }; end }
   end
   rule default_value
-    'null'i { def default_value; nil; end }
-    / value { def default_value; raw_value; end }
+    now { def default_value; text_value; end }
+    / signed_literal { def default_value; text_value; end }
+  end
+  rule now
+    'current_timestamp'i
+    / 'localtimestamp'i { def text_value; 'current_timestamp'; end }
+    / 'localtime'i { def text_value; 'current_timestamp'; end }
+    / 'now()'i { def text_value; 'current_timestamp'; end }
+  end
+  rule signed_literal
+    literal
+    / '+' num_literal { def text_value; num_literal.text_value; end }
+    / '-' num_literal { def text_value; "-#{num_literal.text_value}"; end }
+  end
+  rule literal
+    text_literal
+    / num_literal
+    # / temporal_literal # TODO
+    / null_sym
+    / false_sym
+    / true_sym
+    # / hex_num # TODO
+    # / bin_num # TODO
+    # / underscore_charset hex_num # TODO
+    # / underscore_charset bin_num # TODO
+  end
+  rule text_literal
+    quoted_value { def text_value; text_raw_value; end }
+    # text_string # TODO
+    # / nchar_string # TODO
+    # / underscore_charset text_string # TODO
+    # / text_literal text_string_literal # TODO
+  end
+  rule null_sym
+    'null'i { def text_value; nil; end }
+  end
+  rule false_sym
+    'false'i
+  end
+  rule true_sym
+    'true'i
+  end
+  rule num_literal
+    [0-9]* '.' [0-9]+ { def text_value; v = super; v.start_with?('.') ? "0#{v}" : v; end }
+    / [0-9]+
   end
   rule auto_increment_opt
     'auto_increment'i
@@ -286,11 +329,11 @@ grammar MysqlAlterTable
   end
 
   rule quoted_value
-    '\'' text '\'' { def text_raw_value; text.text_value; end }
+    "'" text "'" { def text_raw_value; text.text_value; end }
   end
 
   rule text
-    ( '\\\'' / !'\'' . )*
+    ("\\\\" / "\\'" / !"'" .)*
   end
 
   rule ident_sys

data/spec/flydata/parser/mysql/alter_table_parser_spec.rb

@@ -210,19 +210,158 @@ describe 'MysqlAlterTableParser' do
         end
       end
 
-      context 'with default option taking an unquoted parameter' do
-        let(:query) { "alter table test_table add column updated_at timestamp default current_timestamp" }
-        it do
-          expect(subject).to eq({
-            type: :alter_table,
-            table_name: "test_table",
-            actions: [{
-              action: :add_column,
-              column: "updated_at",
-              type: "datetime",
-              default: "current_timestamp",
-            }]
-          })
+      context "with default option" do
+        shared_examples "a query parser parsing a query adding a column with a default value" do
+          let(:query) { "alter table test_table add column col #{data_type} default #{value}" }
+          it do
+            expect(subject).to eq({
+              type: :alter_table,
+              table_name: "test_table",
+              actions: [{
+                action: :add_column,
+                column: "col",
+                type: expected_data_type,
+                default: expected_value,
+              }]
+            })
+          end
+        end
+  
+        context 'for timestamp column' do
+          let(:data_type) { "timestamp" }
+          let(:expected_data_type) { "datetime" }
+          context 'taking current_timestamp' do
+            let(:value) { "current_timestamp" }
+            let(:expected_value) { "current_timestamp" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking localtime' do
+            let(:value) { "localtime" }
+            let(:expected_value) { "current_timestamp" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking localtimestamp' do
+            let(:value) { "localtimestamp" }
+            let(:expected_value) { "current_timestamp" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking now()' do
+            let(:value) { "now()" }
+            let(:expected_value) { "current_timestamp" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+        end
+  
+        context 'for integer column' do
+          let(:data_type) { "int(11)" }
+          let(:expected_data_type) { "int4(11)" }
+  
+          context 'taking a positive number without sign' do
+            let(:value) { "1" }
+            let(:expected_value) { "1" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a positive number' do
+            let(:value) { "+1" }
+            let(:expected_value) { "1" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a negative number' do
+            let(:value) { "-1" }
+            let(:expected_value) { "-1" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a negative number string' do
+            let(:value) { %Q|'-1'| }
+            let(:expected_value) { "-1" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking null' do
+            let(:value) { %Q|NULL| }
+            let(:expected_value) { nil }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+        end
+  
+        context 'for decimal column' do
+          let(:data_type) { "decimal(10,2)" }
+          let(:expected_data_type) { "numeric(10,2)" }
+  
+          context 'taking a positive number without sign' do
+            let(:value) { "2.4" }
+            let(:expected_value) { "2.4" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a positive number with sign' do
+            let(:value) { "+0.4" }
+            let(:expected_value) { "0.4" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a positive number no integer part' do
+            let(:value) { ".05" }
+            let(:expected_value) { "0.05" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a negative number' do
+            let(:value) { "-20.43" }
+            let(:expected_value) { "-20.43" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a negative number no integer part' do
+            let(:value) { "-.43" }
+            let(:expected_value) { "-0.43" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+        end
+
+        context 'for varchar column' do
+          let(:data_type) { "varchar(10)" }
+          let(:expected_data_type) { "varchar(30)" }
+  
+          context 'taking null' do
+            let(:value) { "NULL" }
+            let(:expected_value) { nil }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking empty string' do
+            let(:value) { %Q|''| }
+            let(:expected_value) { "" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a string with spaces' do
+            let(:value) { %Q|'0 0 0 0 0 0 0'| }
+            let(:expected_value) { "0 0 0 0 0 0 0" }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a backslash' do
+            let(:value) { %q|'\\\\'| }
+            let(:expected_value) { %q|\\\\| }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
+          context 'taking a string with special characters' do
+            let(:value) { %q|'https://flydata.com $ \\\\\'\"\n\t'| }
+            let(:expected_value) { %q|https://flydata.com $ \\\\\'\"\n\t| }
+  
+            it_behaves_like "a query parser parsing a query adding a column with a default value"
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Koichi Fujikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client