sq-dbsync 1.0.9 → 1.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 53e37af6e23d60d5272a1098971e963e5aac3858
+  data.tar.gz: 382ef96adfef3c9e5fc0ede936ced2d64f5bb611
+SHA512:
+  metadata.gz: 692c020ad723ac6587f56fdfdcabc0e14441fccddc92bd2513926f1f2f61bf0f3945316f5f894667595c08a1b8fbe57e0d679bbc716483273c73ee4e5abdae48
+  data.tar.gz: e86c303e423f7312e13d25fa917d0886c745b49e7eaf81fbeb549649444f77cdd151397ed6a1524329d0bdc206064d366f29958ed923ed32e9f77def9e4aa749

data/lib/sq/dbsync/batch_load_action.rb

@@ -52,8 +52,6 @@ module Sq::Dbsync
     private
 
     def filter_columns
-      source = plan.source_db
-      source_columns = source.hash_schema(plan).keys
       plan.columns = resolve_columns(plan, source_columns)
     end
 

data/lib/sq/dbsync/incremental_load_action.rb

@@ -71,8 +71,6 @@ module Sq::Dbsync
     end
 
     def filter_columns
-      source         = plan.source_db
-      source_columns = source.hash_schema(plan).keys
       plan.columns   = resolve_columns(plan, source_columns) &
         (target_columns || source_columns)
     end

data/lib/sq/dbsync/load_action.rb

@@ -66,15 +66,31 @@ module Sq::Dbsync
     attr_reader :target, :plan, :registry, :logger, :now
 
     def prepare
+      return false unless source_table_exists?
+      return false unless timestamp_column_exists?
+
+      add_schema_to_table_plan(plan)
+      plan.prefixed_table_name = (prefix + plan.table_name.to_s).to_sym
+      filter_columns
+      plan
+    end
+
+    def timestamp_column_exists?
+      columns = resolve_columns(plan, source_columns)
+      plan.timestamp ||= ([:updated_at, :created_at] & columns)[0]
+      unless plan.timestamp
+        logger.log("%s has no timestamp columns" % plan.source_table_name)
+        return false
+      end
+      true
+    end
+
+    def source_table_exists?
       unless plan.source_db.table_exists?(plan.source_table_name)
         logger.log("%s does not exist" % plan.source_table_name)
         return false
       end
-      add_schema_to_table_plan(plan)
-      plan.prefixed_table_name = (prefix + plan.table_name.to_s).to_sym
-      filter_columns
-      plan.timestamp ||=
-        ([:updated_at, :created_at] & plan.columns)[0]
+      true
     end
 
     def ensure_target_exists
@@ -96,6 +112,10 @@ module Sq::Dbsync
       end
     end
 
+    def source_columns
+      plan.source_db.hash_schema(plan).keys
+    end
+
     def extract_to_file(since)
       plan.source_db.ensure_connection
       plan.source_db.set_lock_timeout(10)

data/lib/sq/dbsync/refresh_recent_load_action.rb

@@ -48,8 +48,6 @@ module Sq::Dbsync
     private
 
     def filter_columns
-      source         = plan.source_db
-      source_columns = source.hash_schema(plan).keys
       plan.columns   = resolve_columns(plan, source_columns) &
         (target_columns || source_columns)
     end

data/lib/sq/dbsync/version.rb

@@ -1,5 +1,5 @@
 module Sq
   module Dbsync
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

data/spec/integration/incremental_load_action_spec.rb

@@ -138,7 +138,6 @@ describe SQD::IncrementalLoadAction do
         should == [['new record']]
     end
 
-
     describe 'with custom timestamp' do
       let(:table_plan) {{
         table_name: :test_table,

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sq-dbsync
 version: !ruby/object:Gem::Version
-  version: 1.0.9
-  prerelease: 
+  version: 1.0.10
 platform: ruby
 authors:
 - Xavier Shay
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,65 +28,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Column based, timestamp replication of MySQL and Postgres databases.
@@ -145,27 +134,26 @@ files:
 - sq-dbsync.gemspec
 homepage: http://github.com/square/sq-dbsync
 licenses: []
+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: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Column based, timestamp replication of MySQL and Postgres databases. Uses
   Ruby for the glue code but pushes the heavy lifting on to the database.
 test_files: