forklift_etl 1.1.7 → 1.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forklift_etl (1.1.7)
+    forklift_etl (1.1.8)
       activesupport (~> 4.0, >= 4.0.0)
       elasticsearch (~> 1.0, >= 1.0.0)
       lumberjack (~> 1.0, >= 1.0.0)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.4)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -52,16 +52,16 @@ GEM
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
+    rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+    rspec-support (3.0.4)
     thread_safe (0.3.4)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/forklift/patterns/mysql_patterns.rb

@@ -69,9 +69,17 @@ module Forklift
 
       def self.can_incremental_pipe?(source, from_table, destination, to_table, matcher=source.default_matcher)
         return false unless source.tables.include?(from_table)
-        return false unless source.columns(from_table, source.current_database).include?(matcher)
         return false unless destination.tables.include?(to_table)
-        return false unless destination.columns(to_table, destination.current_database).include?(matcher)
+        source_cols      = source.columns(from_table, source.current_database)
+        destination_cols = destination.columns(to_table, destination.current_database)
+        return false unless source_cols.include?(matcher)
+        return false unless destination_cols.include?(matcher)
+        source_cols.each do |source_col|
+          return false unless destination_cols.include?(source_col)
+        end
+        destination_cols.each do |destination_col|
+          return false unless source_cols.include?(destination_col)
+        end
         true
       end
 

data/lib/forklift/transports/mysql.rb

@@ -68,10 +68,20 @@ module Forklift
         if data.length > 0
           columns = columns(table, database)
           data.each do |d|
-            d = clean_to_columns(d, columns) unless crash_on_extral_col == true
+
+            if crash_on_extral_col == false
+              d.each do |k,v|
+                unless columns.include?(k.to_s)
+                  q("ALTER TABLE `#{database}`.`#{table}` ADD `#{k}` #{sql_type(v)}  NULL  DEFAULT NULL;")
+                  columns = columns(table, database)
+                end
+              end
+            end
+
             if(to_update == true && !d[primary_key.to_sym].nil?)
               q("DELETE FROM `#{database}`.`#{table}` WHERE `#{primary_key}` = #{d[primary_key.to_sym]}")
             end
+
             insert_q = "INSERT INTO `#{database}`.`#{table}` (#{safe_columns(d.keys)}) VALUES (#{safe_values(d.values)});"
             q(insert_q)
           end
@@ -247,14 +257,6 @@ module Forklift
         return a.join(', ')
       end
 
-      def clean_to_columns(row, columns)
-        r = {}
-        row.each do |k,v|
-          r[k] = row[k] if columns.include?(k.to_s)
-        end
-        r
-      end
-
       def safe_values(values)
         a = []
         values.each do |v|

data/lib/forklift/version.rb

@@ -1,3 +1,3 @@
 module Forklift
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/spec/integration/mysql_spec.rb

@@ -135,6 +135,26 @@ describe 'mysql' do
       expect(cols).to eql ['id', 'thing', 'number', 'updated_at']
     end
 
+    it "can add columns to exiting tables when new keys are provided" do
+      table = "users"
+      raw = SpecClient.mysql('forklift_test_source_a')
+
+      count = raw.query("SHOW COLUMNS FROM #{table}").count
+      expect(count).to eql 6
+
+      data = [
+        {email: 'other@example.com', something_else: :abc123, first_name: 'other', last_name: 'n', created_at: Time.new.to_s(:db), updated_at: Time.new.to_s(:db)}
+      ]
+      plan = SpecPlan.new
+      plan.do! {
+        destination = plan.connections[:mysql][:forklift_test_source_a]
+        destination.write(data, table)
+      }
+
+      count = raw.query("SHOW COLUMNS FROM #{table}").count
+      expect(count).to eql 7
+    end
+
     it "can will seek further for null-ish values" do 
       data = [
         {id: 1, thing: 'stuff a', number: nil, updated_at: Time.new},

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: forklift_etl
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
+  prerelease: 
 platform: ruby
 authors:
 - Evan Tahler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,6 +47,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -53,6 +58,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +69,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +91,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,6 +102,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lumberjack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,6 +113,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -191,26 +202,27 @@ files:
 homepage: https://github.com/taskrabbit/forklift
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: forklift_etl
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ! 'Forklift: Moving big databases around. A ruby ETL tool.'
 test_files:
 - spec/config/connections/csv/forklift_test_destination.yml
@@ -242,4 +254,3 @@ test_files:
 - spec/unit/misc/error_spec.rb
 - spec/unit/misc/pid_spec.rb
 - spec/unit/misc/step_spec.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjM4NGIzZDIwMjQzNjg2MTI1ODU4NmUzZmIyZmI5YzVjODZkZjMwZA==
-  data.tar.gz: !binary |-
-    YjU0MGQyNmU3ZGM3MzI4MjJkYzg4NDU4NGJiMjNiMWU0ZDU5NzVhYQ==
-SHA512:
-  metadata.gz: !binary |-
-    ZWU3MWM1OWM1MjAyMmVmNzRlYmVhZGJhMGY5N2Y3NTY5MTVlYzNlN2RhNzEy
-    NGIxMmEyYjRjNGM1NjcxYmVjZjIyM2FkM2FhY2ZjZjc1YmNmMDYzNDQ4MmEy
-    NDBiYTlmZWZiNDVlNjFjY2Y4OTMwYzRhMmFmZDgwOTlhOTUyMjM=
-  data.tar.gz: !binary |-
-    OGQ0ZjZiODA3OGMzZGMxMmY2ZDA5ZTQyZDNmYTQwMTQ2MWM4ODc3NGU4YjY1
-    MjYxMzQxOWQ0OWY0NjUzMzRkNTFmNjdiNDliNjVhMzI3ZDQ2YTg2YzVlOWQw
-    NGJmYzI1ZTE3Y2FlNzhiZGQ2YTA5MjQ2NWM1MjIwNzIyNGM1NjE=