activerecord-redshift-adapter 0.9.0 → 0.9.1

data/{README → README.md}

@@ -1,5 +1,4 @@
-activerecord-redshift-adapter
-=============================
+# activerecord-redshift-adapter
 
 adapter for aws redshift for rails 3
 
@@ -9,9 +8,8 @@ barely tested (I'm working on a project that needs this -- this works as much as
 
 good luck
 
-example database.yml
-====================
-
+## example database.yml
+```yml
 common: &common
   adapter: postgresql
   username: postgres
@@ -32,3 +30,20 @@ redshift_development:
   <<: *common
   <<: *redshiftdb
   database: databasename
+```
+
+## options
+<table>
+  <tr>
+    <th>option</th>
+    <th>description</th>
+  </tr>
+  <tr>
+    <th>schema_search_path</th>
+    <td>set schema_search_path. use default value if not given.</td>
+  </tr>
+  <tr>
+    <th>read_timezone</th>
+    <td>force timezone for datetime when select values. ActiveRecord default timezone will set if not given.</td>
+  </tr>
+</table>

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -32,8 +32,10 @@ module ActiveRecord
   module ConnectionAdapters
     # Redshift-specific extensions to column definitions in a table.
     class RedshiftColumn < Column #:nodoc:
+      attr_accessor :timezone
       # Instantiates a new Redshift column definition in a table.
-      def initialize(name, default, sql_type = nil, null = true)
+      def initialize(name, default, sql_type = nil, null = true, timezone = nil)
+        self.timezone = timezone
         super(name, self.class.extract_value_from_default(default), sql_type, null)
       end
 
@@ -41,6 +43,25 @@ module ActiveRecord
         name == other.name && default == other.default && sql_type == other.sql_type && null == other.null
       end
 
+      def type_cast(value)
+        return nil if value.nil?
+        return coder.load(value) if encoded?
+
+        if timezone && [:datetime, :timestamp].include?(type)
+          self.class.string_to_time_with_timezone(string, timezone)
+        else
+          super
+        end
+      end
+
+      def type_cast_code(var_name)
+        if timezone && [:datetime, :timestamp].include?(type)
+          "#{self.class.name}.string_to_time_with_timezone(#{var_name},'#{timezone}')"
+        else
+          super
+        end
+      end
+
       # :stopdoc:
       class << self
         attr_accessor :money_precision
@@ -54,6 +75,14 @@ module ActiveRecord
             super
           end
         end
+
+        def string_to_time_with_timezone(string, timezone)
+          if string =~ self::Format::ISO_DATETIME
+            Time.parse("#{string} #{timezone}")
+          else
+            string_to_time(string)
+          end
+        end
       end
       # :startdoc:
 
@@ -815,7 +844,7 @@ module ActiveRecord
       def columns(table_name, name = nil)
         # Limit, precision, and scale are all handled by the superclass.
         column_definitions(table_name).collect do |column_name, type, default, notnull|
-          RedshiftColumn.new(column_name, default, type, notnull == 'f')
+          RedshiftColumn.new(column_name, default, type, notnull == 'f', @config[:read_timezone])
         end
       end
 

data/lib/activerecord_redshift_adapter/version.rb

@@ -1,4 +1,4 @@
 module ActiverecordRedshiftAdapter
   # the current version of this gem
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/active_record/base_spec.rb

@@ -1,8 +1,37 @@
 require "spec_helper"
 
 describe ActiveRecord::Base do
-  it "opens a connection" do
-    connection = ActiveRecord::Base.redshift_connection(TEST_CONNECTION_HASH)
-    connection.active?.should be_true
+  let(:connection) { ActiveRecord::Base.redshift_connection(TEST_CONNECTION_HASH) }
+
+  describe '.redshift_connection' do
+    it "opens a connection" do
+      expect(connection).to be_active
+    end
+  end
+
+  describe 'set UTC timezone for datetime' do
+    class TimezoneTest < ActiveRecord::Base
+      default_timezone = :jst
+      establish_connection(TEST_CONNECTION_HASH.merge('adapter' => 'redshift', 'read_timezone' => 'UTC'))
+    end
+
+    before do
+      connection.query <<-SQL
+        CREATE TABLE public.timezone_tests ( "id" INTEGER NULL, "created_at" TIMESTAMP NULL );
+        INSERT INTO public.timezone_tests VALUES (1, '2013-07-01 12:00:00');
+      SQL
+    end
+
+    after do
+      connection.query <<-SQL
+        DROP TABLE public.timezone_tests;
+      SQL
+    end
+
+    it 'returns timestamp as UTC' do
+      data = TimezoneTest.all.first
+      expect(data.created_at.zone).to eq 'UTC'
+      expect(data.created_at).to eq Time.parse '2013-07-01 12:00:00 UTC'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -68,7 +68,7 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README
+- README.md
 - Rakefile
 - activerecord-redshift-adapter.gemspec
 - lib/active_record/connection_adapters/redshift_adapter.rb