Merge branch 'master' of github.com:attribution/sequel-redshift

Author: Rustik

Diff for: lib/sequel/adapters/redshift.rb

@@ -16,6 +16,10 @@ class Database < Postgres::Database
       # The order of column modifiers to use when defining a column.
       COLUMN_DEFINITION_ORDER = [:collate, :default, :primary_key, :dist_key, :sort_key, :null, :unique, :auto_increment, :references]
 
+      def dataset_class_default
+        Sequel::Redshift::Dataset
+      end
+
       # We need to change these default settings because they correspond to
       # Postgres configuration variables which do not exist in Redshift
       def adapter_initialize
@@ -27,9 +31,9 @@ def adapter_initialize
       end
 
       def column_definition_primary_key_sql(sql, column)
-        result = super
-        result << ' IDENTITY' if result
-        result
+        if column[:primary_key] && column[:type] == Integer
+          sql << ' IDENTITY'
+        end
       end
 
       # Add DISTKEY SQL fragment to column creation SQL.
@@ -61,16 +65,22 @@ def combinable_alter_table_op?(op)
         false
       end
 
+      def supports_transactional_ddl?
+        false
+      end
+
     end
 
     class Dataset < Postgres::Dataset
       Database::DatasetClass = self
 
       Dataset.def_sql_method(self, :select, [['if opts[:values]', %w'values order limit'], ['elsif server_version >= 80400', %w'with select distinct columns from join where group having window compounds order limit lock'], ['else', %w'with select distinct columns from join where group having compounds order limit lock']])
 
-      def initialize(*args)
-        super(*args)
-        @opts = @opts.merge(disable_insert_returning: true).freeze
+      def initialize(db)
+        @db = db
+        @opts = {disable_insert_returning: true}.freeze
+        @cache = {}
+        freeze
       end
 
       def supports_cte?(type = :select)

Diff for: sequel-redshift.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pg"
-  spec.add_dependency "sequel"
+  spec.add_dependency "sequel", '~> 5'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

Diff for: spec/features/redshift_spec.rb

@@ -9,6 +9,7 @@
   end
 
   it "inserts new record" do
+    DB.drop_table? :items
     DB.create_table :items do
       primary_key :id
       column :name, 'varchar(255)'

Diff for: spec/spec_helper.rb

@@ -22,6 +22,9 @@
 options.merge(logger: Logger.new(STDOUT))
 
 DB = Sequel.connect(options)
+if ENV['DEBUG_SQL'] == 'true'
+  DB.loggers << Logger.new($stdout)
+end
 # Run all the tests in a specific test schema
 DB.run "set search_path to 'sequel_redshift_adapter_test'"