redshift-on-postgres-adapter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4ea52a6cec6775aac84c1711973c1624594f84
-  data.tar.gz: 4911ef9d2c209fb0ce3520673519e818b785df8c
+  metadata.gz: 62e429688c40157d24f90a268531368e97c4c85b
+  data.tar.gz: b3841ac0057bb23434b7adc2b2c2cec2b8c12ccd
 SHA512:
-  metadata.gz: a852e81f0e07a13c204ed00aa3a944386bc74581c60c432a6bf46ca86afe828b7f8558461ee62b8499bdb4127d2619c013573b5953b93540c32483530bc7b6df
-  data.tar.gz: 3d0a950f4639ae94fe999e203658d0e099f1c3a340e001a99951c6a32d76a092ea977ab0ec0a9b9faceb010cfeae52f0c0a085521300e10492ad692c42d3c5be
+  metadata.gz: d8ae23dbbcf94eab0a76684335c11a653662da627b9ace8fc3ce2d0de566417f513ef91a574e6dfad26c839f491642b66d63fc86f7cac6aff583398e5f811584
+  data.tar.gz: 52d8afbdc7816fdec9a1dc4ebaa6dcd7db789dee51c970251a220dc49002e9e6bae4bc8ced4590bff3ec2663b403316d0673c5fee273ceab1498d6cdb897010a

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

@@ -0,0 +1,28 @@
+
+module ActiveRecord::ConnectionAdapters
+  module Redshift
+
+    class ColumnDefinition < PostgreSQL::ColumnDefinition
+      attr_accessor :distkey, :sortkey, :encode
+    end
+
+    class TableDefinition < PostgreSQL::TableDefinition
+      def new_column_definition(name, type, options) # :nodoc:
+        column = super
+        column.distkey = options[:distkey]
+        column.sortkey = options[:sortkey]
+        column.encode = options[:encode]
+        column
+      end
+
+      private
+
+        def create_column_definition(name, type)
+          ColumnDefinition.new(name, type)
+        end
+    end
+
+    class Table < PostgreSQL::Table
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+
+module ActiveRecord::ConnectionAdapters
+  module Redshift
+    class SchemaCreation < PostgreSQL::SchemaCreation
+      ENCODING_TYPES = %w[RAW BYTEDICT DELTA DELTA32K LZO MOSTLY8 MOSTLY16 MOSTLY32 RUNLENGTH TEXT255 TEXT32K]
+
+      def column_options(o)
+        column_options = super
+        column_options[:distkey] = o.distkey
+        column_options[:sortkey] = o.sortkey
+
+        if o.encode
+          encode = o.encode.to_s.upcase
+          if ENCODING_TYPES.include?(encode)
+            column_options[:encode] = encode
+          else
+            raise "Invalid encoding type: #{o.encode}"
+          end
+        else
+          # column_options[:encode] = 'RAW'
+        end
+
+        column_options
+      end
+
+      # Support
+      def add_column_options!(sql, options)
+        if options[:distkey]
+          sql << ' DISTKEY'
+        end
+
+        if options[:sortkey]
+          sql << ' SORTKEY'
+        end
+
+        if options[:encode]
+          sql << " ENCODE #{options[:encode]}"
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/redshift_adapter.rb

@@ -2,6 +2,8 @@
 require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'active_record/tasks/redshift_database_tasks'
+require 'active_record/connection_adapters/redshift/schema_statements'
+require 'active_record/connection_adapters/redshift/schema_definitions'
 
 ActiveRecord::Tasks::DatabaseTasks.register_task(/redshift/,   ActiveRecord::Tasks::RedshiftDatabaseTasks)
 
@@ -24,143 +26,167 @@ module ActiveRecord::ConnectionHandling
   end
 end
 
-class ActiveRecord::ConnectionAdapters::RedshiftAdapter < ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  ADAPTER_NAME = 'Redshift'.freeze
+module ActiveRecord::ConnectionAdapters
+  class RedshiftAdapter < PostgreSQLAdapter
+    ADAPTER_NAME = 'Redshift'.freeze
 
-  def initialize(connection, logger, connection_parameters, config)
-    super
-  end
+    NATIVE_DATABASE_TYPES = PostgreSQLAdapter::NATIVE_DATABASE_TYPES.merge({
+      primary_key: "bigint primary key identity(1,1)",
+    })
+
+    def initialize(connection, logger, connection_parameters, config)
+      super
+    end
 
-  # Configures the encoding, verbosity, schema search path, and time zone of the connection.
-  # This is called by #connect and should not be called manually.
-  def configure_connection
-    if @config[:encoding]
-      @connection.set_client_encoding(@config[:encoding])
-    end
-    # self.client_min_messages = @config[:min_messages] || 'warning'
-    self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
-
-    # Use standard-conforming strings so we don't have to do the E'...' dance.
-    # set_standard_conforming_strings
-
-    # If using Active Record's time zone support configure the connection to return
-    # TIMESTAMP WITH ZONE types in UTC.
-    # (SET TIME ZONE does not use an equals sign like other SET variables)
-    # if ActiveRecord::Base.default_timezone == :utc
-    #   execute("SET time zone 'UTC'", 'SCHEMA')
-    # elsif @local_tz
-    #   execute("SET time zone '#{@local_tz}'", 'SCHEMA')
-    # end
-
-    # SET statements from :variables config hash
-    # http://www.postgresql.org/docs/8.3/static/sql-set.html
-    variables = @config[:variables] || {}
-    variables.map do |k, v|
-      if v == ':default' || v == :default
-        # Sets the value to the global or compile default
-        execute("SET SESSION #{k} TO DEFAULT", 'SCHEMA')
-      elsif !v.nil?
-        execute("SET SESSION #{k} TO #{quote(v)}", 'SCHEMA')
+    # Configures the encoding, verbosity, schema search path, and time zone of the connection.
+    # This is called by #connect and should not be called manually.
+    def configure_connection
+      if @config[:encoding]
+        @connection.set_client_encoding(@config[:encoding])
+      end
+      # self.client_min_messages = @config[:min_messages] || 'warning'
+      self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
+
+      # Use standard-conforming strings so we don't have to do the E'...' dance.
+      # set_standard_conforming_strings
+
+      # If using Active Record's time zone support configure the connection to return
+      # TIMESTAMP WITH ZONE types in UTC.
+      # (SET TIME ZONE does not use an equals sign like other SET variables)
+      # if ActiveRecord::Base.default_timezone == :utc
+      #   execute("SET time zone 'UTC'", 'SCHEMA')
+      # elsif @local_tz
+      #   execute("SET time zone '#{@local_tz}'", 'SCHEMA')
+      # end
+
+      # SET statements from :variables config hash
+      # http://www.postgresql.org/docs/8.3/static/sql-set.html
+      variables = @config[:variables] || {}
+      variables.map do |k, v|
+        if v == ':default' || v == :default
+          # Sets the value to the global or compile default
+          execute("SET SESSION #{k} TO DEFAULT", 'SCHEMA')
+        elsif !v.nil?
+          execute("SET SESSION #{k} TO #{quote(v)}", 'SCHEMA')
+        end
       end
     end
-  end
 
-  def postgresql_version
-    return 100000 + 80002
-  end
+    def postgresql_version
+      # Hack to avoid native PostgreQLAdapter's version check
+      return 100000 + 80002
+    end
 
-  def supports_statement_cache?
-    false
-  end
+    def native_database_types #:nodoc:
+      NATIVE_DATABASE_TYPES
+    end
 
-  def supports_index_sort_order?
-    false
-  end
+    def supports_statement_cache?
+      false
+    end
 
-  def supports_partial_index?
-    false
-  end
+    def supports_index_sort_order?
+      false
+    end
 
-  def supports_transaction_isolation?
-    false
-  end
+    def supports_partial_index?
+      false
+    end
 
-  def supports_foreign_keys?
-    false
-  end
+    def supports_transaction_isolation?
+      false
+    end
 
-  def supports_views?
-    false
-  end
+    def supports_foreign_keys?
+      false
+    end
 
-  def supports_extensions?
-    false
-  end
+    def supports_views?
+      false
+    end
 
-  def supports_ranges?
-    false
-  end
+    def supports_extensions?
+      false
+    end
 
-  def supports_materialized_views?
-    false
-  end
+    def supports_ranges?
+      false
+    end
 
-  def use_insert_returning?
-    false
-  end
+    def supports_materialized_views?
+      false
+    end
 
-  # Returns the list of a table's column names, data types, and default values.
-  #
-  # The underlying query is roughly:
-  #  SELECT column.name, column.type, default.value
-  #    FROM column LEFT JOIN default
-  #      ON column.table_id = default.table_id
-  #     AND column.num = default.column_num
-  #   WHERE column.table_id = get_table_id('table_name')
-  #     AND column.num > 0
-  #     AND NOT column.is_dropped
-  #   ORDER BY column.num
-  #
-  # If the table name is not prefixed with a schema, the database will
-  # take the first match from the schema search path.
-  #
-  # Query implementation notes:
-  #  - format_type includes the column size constraint, e.g. varchar(50)
-  #  - ::regclass is a function that gives the id for a table name
-  def column_definitions(table_name) #:nodoc:
-    exec_query(<<-end_sql, 'SCHEMA').rows
-      SELECT a.attname, format_type(a.atttypid, a.atttypmod),
-               pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod
-        FROM pg_attribute a LEFT JOIN pg_attrdef d
-          ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-       WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
-         AND a.attnum > 0 AND NOT a.attisdropped
-       ORDER BY a.attnum
-    end_sql
-  end
+    def use_insert_returning?
+      false
+    end
 
-  # Returns just a table's primary key
-  def primary_keys(table)
-    row = exec_query(<<-end_sql, 'SCHEMA').rows.map do |row|
-      SELECT DISTINCT(attr.attname)
-      FROM pg_attribute attr
-      INNER JOIN pg_depend dep ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
-      INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
-      WHERE cons.contype = 'p'
-        AND dep.refobjid = '#{quote_table_name(table)}'::regclass
-    end_sql
-      row && row.first
+    # Returns the list of a table's column names, data types, and default values.
+    #
+    # The underlying query is roughly:
+    #  SELECT column.name, column.type, default.value
+    #    FROM column LEFT JOIN default
+    #      ON column.table_id = default.table_id
+    #     AND column.num = default.column_num
+    #   WHERE column.table_id = get_table_id('table_name')
+    #     AND column.num > 0
+    #     AND NOT column.is_dropped
+    #   ORDER BY column.num
+    #
+    # If the table name is not prefixed with a schema, the database will
+    # take the first match from the schema search path.
+    #
+    # Query implementation notes:
+    #  - format_type includes the column size constraint, e.g. varchar(50)
+    #  - ::regclass is a function that gives the id for a table name
+    def column_definitions(table_name) #:nodoc:
+      exec_query(<<-end_sql, 'SCHEMA').rows
+        SELECT a.attname, format_type(a.atttypid, a.atttypmod),
+                 pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod
+          FROM pg_attribute a LEFT JOIN pg_attrdef d
+            ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+         WHERE a.attrelid = '#{quote_table_name(table_name)}'::regclass
+           AND a.attnum > 0 AND NOT a.attisdropped
+         ORDER BY a.attnum
+      end_sql
     end
-  end
 
-  def indexes(table_name, name = nil)
-    []
-  end
+    # Returns just a table's primary key
+    def primary_keys(table)
+      row = exec_query(<<-end_sql, 'SCHEMA').rows.map do |row|
+        SELECT DISTINCT(attr.attname)
+        FROM pg_attribute attr
+        INNER JOIN pg_depend dep ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
+        INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
+        WHERE cons.contype = 'p'
+          AND dep.refobjid = '#{quote_table_name(table)}'::regclass
+      end_sql
+        row && row.first
+      end
+    end
 
-  def get_advisory_lock(lock_id)
-    lock_id
-  end
+    def indexes(table_name, name = nil)
+      []
+    end
+
+    def get_advisory_lock(lock_id)
+      lock_id
+    end
+
+    def release_advisory_lock(lock_id)
+    end
 
-  def release_advisory_lock(lock_id)
+    # Schema Statements
+    def create_table_definition(*args) # :nodoc:
+      Redshift::TableDefinition.new(*args)
+    end
+
+    def update_table_definition(table_name, base) #:nodoc:
+      Redshift::Table.new(table_name, base)
+    end
+
+    def schema_creation # :nodoc:
+      Redshift::SchemaCreation.new self
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redshift-on-postgres-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dongyi Liao
@@ -44,9 +44,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/active_record/connection_adapters/redshift/schema_definitions.rb
+- lib/active_record/connection_adapters/redshift/schema_statements.rb
 - lib/active_record/connection_adapters/redshift_adapter.rb
-- lib/active_record/tasks/redshift_database_tasks.rb
-homepage: http://github.com/liaody
+homepage: https://github.com/liaody/redshift-on-postgres-adapter
 licenses:
 - New BSD License
 metadata: {}

data/lib/active_record/tasks/redshift_database_tasks.rb

@@ -1,7 +0,0 @@
-require 'active_record/tasks/postgresql_database_tasks'
-
-class ActiveRecord::Tasks::RedshiftDatabaseTasks < ActiveRecord::Tasks::PostgreSQLDatabaseTasks # :nodoc:
-  def initialize(configuration)
-    super
-  end
-end