sq-dbsync 1.0.2 → 1.0.3

data/lib/sq/dbsync/database/postgres.rb

@@ -51,6 +51,10 @@ module Sq::Dbsync::Database
 
         "time without time zone" => "time",
         "timestamp without time zone" => "datetime",
+
+        # mysql has no single-column representation for timestamp with time zone
+        "timestamp with time zone" => "datetime",
+
         "boolean" => "char(1)"
       }.fetch(db_type, db_type)
     end
@@ -60,7 +64,7 @@ module Sq::Dbsync::Database
       file = sql_to_file(sql)
 
       cmd = "set -o pipefail; "
-      cmd += "psql --no-align --tuples-only -F '\t'"
+      cmd += "env PGTZ=utc psql --no-align --tuples-only -F '\t'"
       cmd += " -U %s" % opts[:user]     if opts[:user]
       cmd += " -h %s" % opts[:host]     if opts[:host]
       cmd += " -p %i" % opts[:port]     if opts[:port]

data/lib/sq/dbsync/version.rb

@@ -1,5 +1,5 @@
 module Sq
   module Dbsync
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/spec/integration/batch_load_action_spec.rb

@@ -224,6 +224,37 @@ describe SQD::BatchLoadAction do
     let(:source) { test_source(:postgres) }
 
     it_should_behave_like 'a batch load'
-  end
 
+    it 'loads records with time zones' do
+      table_plan = {
+        table_name: :test_table,
+        source_table_name: :test_table,
+        columns: [:id, :col1, :updated_at, :ts_with_tz],
+        source_db: source,
+        indexes: index
+      }
+
+      action = SQD::BatchLoadAction.new(target,
+                                        table_plan,
+                                        registry,
+                                        SQD::Loggers::Null.new,
+                                        ->{ @now })
+
+      create_pg_source_table_with(
+        id:         1,
+        col1:       'hello',
+        pii:        'don alias',
+        created_at: '2012-01-01 01:01:01',
+        updated_at: '2012-01-01 01:01:01',
+        ts_with_tz: '2012-01-01 01:01:01+02',
+      )
+
+      registry.ensure_storage_exists
+
+      action.call
+
+      target[:test_table].count.should == 1
+      target[:test_table].to_a.last[:ts_with_tz].should == Time.utc(2011, 12, 31, 23, 1, 1)
+    end
+  end
 end

data/spec/integration_helper.rb

@@ -24,6 +24,30 @@ def create_source_table_with(*rows)
   end
 end
 
+def create_pg_source_table_with(*rows)
+  # Total hack to allow source db to be passed as optional first argument.
+  if rows[0].is_a?(Hash)
+    source_db  = source
+  else
+    source_db  = rows.shift
+  end
+  table_name = :test_table
+
+  source_db.create_table! table_name do
+    primary_key  :id
+    String       :col1
+    String       :pii
+    DateTime     :updated_at
+    DateTime     :created_at
+    DateTime     :imported_at
+    column :ts_with_tz, 'timestamp with time zone'
+  end
+
+  rows.each do |row|
+    source_db[table_name].insert(row)
+  end
+end
+
 def setup_target_table(last_synced_at)
   target.create_table! :test_table do
     Integer  :id

metadata

@@ -1,105 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sq-dbsync
-version: !ruby/object:Gem::Version
-  version: 1.0.2
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 3
+  version: 1.0.3
 platform: ruby
-authors:
+authors: 
 - Xavier Shay
 - Damon McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cane
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !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
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Column based, timestamp replication of MySQL and Postgres databases.
-email:
+email: 
 - xavier@squareup.com
 - damon@squaerup.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - spec/acceptance/loading_spec.rb
 - spec/acceptance_helper.rb
 - spec/database_helper.rb
@@ -145,30 +145,38 @@ files:
 - sq-dbsync.gemspec
 homepage: http://github.com/square/sq-dbsync
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-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:
+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: 
 - spec/acceptance/loading_spec.rb
 - spec/acceptance_helper.rb
 - spec/database_helper.rb
@@ -185,3 +193,4 @@ test_files:
 - spec/unit/pipeline_spec.rb
 - spec/unit/stream_logger_spec.rb
 - spec/unit_helper.rb
+has_rdoc: false