flydata 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2014-05-15"
+  s.date = "2014-05-17"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["fdmysqldump", "flydata"]
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     "spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb",
     "spec/flydata/heroku_spec.rb",
     "spec/flydata/table_def/mysql_table_def_spec.rb",
+    "spec/flydata/table_def/mysqldump_test_foreign_key.dump",
     "spec/flydata/table_def/mysqldump_test_table_all.dump",
     "spec/flydata/table_def/mysqldump_test_table_column_comment.dump",
     "spec/flydata/table_def/mysqldump_test_table_enum.dump",

data/lib/flydata/command/sync.rb

@@ -929,10 +929,12 @@ EOT
               index += 1
               if chars.start_with?("'")
                 # single item (not last item)
-                if chars.end_with?("'") and !last_char_escaped?(chars)
+                # size check added below otherwise end_with? matches the single quote which was also used by start_with?
+                if chars.size > 1 and chars.end_with?("'") and !last_char_escaped?(chars)
                   @values << replace_escape_char(chars[1..-2])
                 # single item (last item)
-                elsif chars.end_with?("')") and !last_char_escaped?(chars[0..-2])
+                # size check added below otherwise end_with? matches the single quote which was also used by start_with?
+                elsif chars.size > 2 and chars.end_with?("')") and !last_char_escaped?(chars[0..-2])
                   @values << replace_escape_char(chars[1..-3])
                   @values_set << @values
                   @values = []

data/spec/flydata/command/sync_spec.rb

@@ -1162,6 +1162,55 @@ EOT
             expect(subject).to eq([['1',"D:\\download\\",'2014-04-15 13:49:14']])
           end
         end
+
+        context 'when comma is the first character of a string' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,',9','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1',',9','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when comma is the last character of a string' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,'9,','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1','9,','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when a string consists of a comma' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,',','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1',',','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when two commas are given as a string' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,',,','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1',',,','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when an empty string value is given' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,'','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1','','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when a value consists of a comma followed by closing bracket' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,'),ksd','2014-04-15 13:49:14');" }
+          it 'should parse the string correctly' do
+            expect(subject).to eq([['1','),ksd','2014-04-15 13:49:14']])
+          end
+        end
+
+        context 'when there is a white space before the closing bracket' do
+          let(:target_line) { "INSERT INTO `test_table` VALUES (1,'aa','2014-04-15 13:49:14' );" }
+          it 'should fail to parse.  This is intentional for performance reason' do
+            expect{subject}.to raise_error
+          end
+        end
       end
     end
   end

data/spec/flydata/table_def/mysqldump_test_foreign_key.dump

@@ -0,0 +1,48 @@
+-- MySQL dump 10.13  Distrib 5.1.73, for redhat-linux-gnu (x86_64)
+--
+-- Host: strenua.flydata.co    Database: create_table_examples
+-- ------------------------------------------------------
+-- Server version	5.6.17-1+deb.sury.org~precise+1-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `product_order`
+--
+
+DROP TABLE IF EXISTS `product_order`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `product_order` (
+  `no` int(11) NOT NULL AUTO_INCREMENT,
+  `product_category` int(11) NOT NULL,
+  `product_id` int(11) NOT NULL,
+  `customer_id` int(11) NOT NULL,
+  PRIMARY KEY (`no`),
+  KEY `product_category` (`product_category`,`product_id`),
+  KEY `customer_id` (`customer_id`),
+  CONSTRAINT `product_order_ibfk_1` FOREIGN KEY (`product_category`, `product_id`) REFERENCES `product` (`category`, `id`) ON UPDATE CASCADE,
+  CONSTRAINT `product_order_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2014-05-15 19:47:48
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -366,6 +366,7 @@ files:
 - spec/flydata/fluent-plugins/in_mysql_binlog_flydata_spec.rb
 - spec/flydata/heroku_spec.rb
 - spec/flydata/table_def/mysql_table_def_spec.rb
+- spec/flydata/table_def/mysqldump_test_foreign_key.dump
 - spec/flydata/table_def/mysqldump_test_table_all.dump
 - spec/flydata/table_def/mysqldump_test_table_column_comment.dump
 - spec/flydata/table_def/mysqldump_test_table_enum.dump
@@ -390,7 +391,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -913931267445812581
+      hash: 2175576432657099450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: