activerecord4-redshift-adapter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f882890a917a408523cf0d811fec93c61f662b
-  data.tar.gz: b946f1a2a36571c0ddfb1e4fa8087396b590d5b4
+  metadata.gz: eea0356bef6917cb809017578ae67b75acfdfe6a
+  data.tar.gz: 8f0012056c332525da97265ec6e0f9b5fea2410f
 SHA512:
-  metadata.gz: a11030528067cd95e0e19f046db194214642be0bfe93d42394d9160e4aa6627ea420e4ee1684273aaaa56e782e587bdb1a67df18a0d52011ac04763d27daa2f0
-  data.tar.gz: 8638c106814e78f348adeccb9e0b896a53287da248993be0e546cd4c9a4e0da0f06769c6330dc6bfbfd641b41c9c3e565d0bb2e24b46233e4360e6c67c523b87
+  metadata.gz: 073586046aa238f83261868024f4d6378de00763d0ce2ac4225bb5b2725f3f499147f7045cc3910d3e249e07b098901e56764e73b9d5cf81a76474c14e5877ca
+  data.tar.gz: 270baf4730a43bd80134d08ce5f5582adc99d13d02f644d83de42b6727d8f9de2f3e3caeaf720686062a9e10b1042a4c49e2f43cdbfec31d667a5713a173ffc3

data/README.md

@@ -15,9 +15,13 @@ I abandon this driver.
 Usage
 -------------------
 
-In Gemfile
+For Rails 4.2, write following in Gemfile:
 ```
-gem 'activerecord4-redshift-adapter', github: 'aamine/activerecord4-redshift-adapter'
+gem 'activerecord4-redshift-adapter', '~> 0.2.0'
+```
+For Rails 4.1:
+```
+gem 'activerecord4-redshift-adapter', '~> 0.1.1'
 ```
 
 In database.yml

data/lib/active_record/connection_adapters/redshift/schema_definitions.rb

@@ -52,12 +52,6 @@ module ActiveRecord
           column name, type, options
         end
 
-        def new_column_definition(name, type, options) # :nodoc:
-          column = super
-          column.array = options[:array]
-          column
-        end
-
         private
 
           def create_column_definition(name, type)

data/lib/active_record/connection_adapters/redshift/schema_statements.rb

@@ -14,10 +14,6 @@ module ActiveRecord
         end
 
         def add_column_options!(sql, options)
-          if options[:array] || options[:column].try(:array)
-            sql << '[]'
-          end
-
           column = options.fetch(:column) { return super }
           if column.type == :uuid && options[:default] =~ /\(\)/
             sql << " DEFAULT #{options[:default]}"
@@ -58,18 +54,6 @@ module ActiveRecord
             memo += case key
             when :owner
               " OWNER = \"#{value}\""
-            when :template
-              " TEMPLATE = \"#{value}\""
-            when :encoding
-              " ENCODING = '#{value}'"
-            when :collation
-              " LC_COLLATE = '#{value}'"
-            when :ctype
-              " LC_CTYPE = '#{value}'"
-            when :tablespace
-              " TABLESPACE = \"#{value}\""
-            when :connection_limit
-              " CONNECTION LIMIT = #{value}"
             else
               ""
             end
@@ -83,7 +67,7 @@ module ActiveRecord
         # Example:
         #   drop_database 'matt_development'
         def drop_database(name) #:nodoc:
-          execute "DROP DATABASE IF EXISTS #{quote_table_name(name)}"
+          execute "DROP DATABASE #{quote_table_name(name)}"
         end
 
         # Returns the list of all tables in the schema search path or a specified schema.
@@ -167,18 +151,10 @@ module ActiveRecord
           end_sql
         end
 
-        # Returns the current database collation.
         def collation
-          query(<<-end_sql, 'SCHEMA')[0][0]
-            SELECT pg_database.datcollate FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
-          end_sql
         end
 
-        # Returns the current database ctype.
         def ctype
-          query(<<-end_sql, 'SCHEMA')[0][0]
-            SELECT pg_database.datctype FROM pg_database WHERE pg_database.datname LIKE '#{current_database}'
-          end_sql
         end
 
         # Returns an array of schema names.
@@ -235,97 +211,14 @@ module ActiveRecord
           result.rows.first.first
         end
 
-        # Sets the sequence of a table's primary key to the specified value.
         def set_pk_sequence!(table, value) #:nodoc:
-          pk, sequence = pk_and_sequence_for(table)
-
-          if pk
-            if sequence
-              quoted_sequence = quote_table_name(sequence)
-
-              select_value <<-end_sql, 'SCHEMA'
-              SELECT setval('#{quoted_sequence}', #{value})
-              end_sql
-            else
-              @logger.warn "#{table} has primary key #{pk} with no default sequence" if @logger
-            end
-          end
         end
 
-        # Resets the sequence of a table's primary key to the maximum value.
         def reset_pk_sequence!(table, pk = nil, sequence = nil) #:nodoc:
-          unless pk and sequence
-            default_pk, default_sequence = pk_and_sequence_for(table)
-
-            pk ||= default_pk
-            sequence ||= default_sequence
-          end
-
-          if @logger && pk && !sequence
-            @logger.warn "#{table} has primary key #{pk} with no default sequence"
-          end
-
-          if pk && sequence
-            quoted_sequence = quote_table_name(sequence)
-
-            select_value <<-end_sql, 'SCHEMA'
-              SELECT setval('#{quoted_sequence}', (SELECT COALESCE(MAX(#{quote_column_name pk})+(SELECT increment_by FROM #{quoted_sequence}), (SELECT min_value FROM #{quoted_sequence})) FROM #{quote_table_name(table)}), false)
-            end_sql
-          end
         end
 
-        # Returns a table's primary key and belonging sequence.
         def pk_and_sequence_for(table) #:nodoc:
-          # First try looking for a sequence with a dependency on the
-          # given table's primary key.
-          result = query(<<-end_sql, 'SCHEMA')[0]
-            SELECT attr.attname, nsp.nspname, seq.relname
-            FROM pg_class      seq,
-                 pg_attribute  attr,
-                 pg_depend     dep,
-                 pg_constraint cons,
-                 pg_namespace  nsp
-            WHERE seq.oid           = dep.objid
-              AND seq.relkind       = 'S'
-              AND attr.attrelid     = dep.refobjid
-              AND attr.attnum       = dep.refobjsubid
-              AND attr.attrelid     = cons.conrelid
-              AND attr.attnum       = cons.conkey[1]
-              AND seq.relnamespace  = nsp.oid
-              AND cons.contype      = 'p'
-              AND dep.classid       = 'pg_class'::regclass
-              AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
-          end_sql
-
-          if result.nil? or result.empty?
-            result = query(<<-end_sql, 'SCHEMA')[0]
-              SELECT attr.attname, nsp.nspname,
-                CASE
-                  WHEN pg_get_expr(def.adbin, def.adrelid) !~* 'nextval' THEN NULL
-                  WHEN split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2) ~ '.' THEN
-                    substr(split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2),
-                           strpos(split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2), '.')+1)
-                  ELSE split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2)
-                END
-              FROM pg_class       t
-              JOIN pg_attribute   attr ON (t.oid = attrelid)
-              JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
-              JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
-              JOIN pg_namespace   nsp  ON (t.relnamespace = nsp.oid)
-              WHERE t.oid = '#{quote_table_name(table)}'::regclass
-                AND cons.contype = 'p'
-                AND pg_get_expr(def.adbin, def.adrelid) ~* 'nextval|uuid_generate'
-            end_sql
-          end
-
-          pk = result.shift
-          if result.last
-            [pk, PostgreSQL::Name.new(*result)]
-          else
-            [pk, nil]
-          end
-        rescue
-          nil
+          [nil, nil]
         end
 
         # Returns just a table's primary key
@@ -418,7 +311,7 @@ module ActiveRecord
 
         def foreign_keys(table_name)
           fk_info = select_all <<-SQL.strip_heredoc
-            SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+            SELECT t2.relname AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
             FROM pg_constraint c
             JOIN pg_class t1 ON c.conrelid = t1.oid
             JOIN pg_class t2 ON c.confrelid = t2.oid

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -76,9 +76,9 @@ module ActiveRecord
       ADAPTER_NAME = 'Redshift'.freeze
 
       NATIVE_DATABASE_TYPES = {
-        primary_key: "integer primary key",
-        string:      { name: "character varying" },
-        text:        { name: "text" },
+        primary_key: "integer identity primary key",
+        string:      { name: "varchar" },
+        text:        { name: "varchar" },
         integer:     { name: "integer" },
         float:       { name: "float" },
         decimal:     { name: "decimal" },
@@ -86,8 +86,7 @@ module ActiveRecord
         time:        { name: "time" },
         date:        { name: "date" },
         bigint:      { name: "bigint" },
-        json:        { name: "json" },
-        jsonb:       { name: "jsonb" }
+        boolean:     { name: "boolean" },
       }
 
       OID = Redshift::OID #:nodoc:
@@ -105,16 +104,10 @@ module ActiveRecord
       # AbstractAdapter
       def prepare_column_options(column, types) # :nodoc:
         spec = super
-        spec[:array] = 'true' if column.respond_to?(:array) && column.array
         spec[:default] = "\"#{column.default_function}\"" if column.default_function
         spec
       end
 
-      # Adds +:array+ as a valid migration key
-      def migration_keys
-        super + [:array]
-      end
-
       # Returns +true+, since this connection adapter supports prepared statement
       # caching.
       def supports_statement_cache?
@@ -403,16 +396,11 @@ module ActiveRecord
           m.alias_type 'char', 'varchar'
           m.alias_type 'name', 'varchar'
           m.alias_type 'bpchar', 'varchar'
+          m.register_type 'bool', Type::Boolean.new
           m.alias_type 'timestamptz', 'timestamp'
           m.register_type 'date', OID::Date.new
           m.register_type 'time', OID::Time.new
 
-          m.register_type 'json', OID::Json.new
-          m.register_type 'jsonb', OID::Jsonb.new
-
-          # FIXME: why are we keeping these types as strings?
-          m.alias_type 'interval', 'varchar'
-
           m.register_type 'timestamp' do |_, _, sql_type|
             precision = extract_precision(sql_type)
             OID::DateTime.new(precision: precision)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord4-redshift-adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Amazon Redshift adapter for ActiveRecord 4