blue-shift 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854cfe4464d33859954cd59b31e0aab3416ff3c3
-  data.tar.gz: 36e046e96ca8f013b9a1dcfed1017334f2a2c4a1
+  metadata.gz: f9ff2aa70afe9aae6299cd15f51a8afb60862184
+  data.tar.gz: a275f2007b457f80140668ca19917739c6e4270c
 SHA512:
-  metadata.gz: 5a3dacb4ab8e472434905142c1f1ffe344a269cc80e1e8194524bc10b80c1dddeab08677be3ff2961f463b8da3de0a36170a12a6614b771759d5c1b0da959e32
-  data.tar.gz: f3969bf286f9e125c1d621e8bcab8e4ada926757d688844ee6888b1b7ac6b601c8436fb442a20e5887d9a6a5fef6216b5dee71af5f5b2518659f15eaebb9c72a
+  metadata.gz: 7f4473e6459b7b5fbfd8a6f1a9a7d12b4de70671cf6cc92e3d75a3301d4fa8361d48cb89d6a7115d3fc949d3e80f51dbab97488fc2b23f10bc74f1f358854be9
+  data.tar.gz: 41d9dccc4493a44f10bbf4625c5dd83491834f045b45951d4e63593fd8db269600ade1ac869b4c8a2b154ac0ab8a97e26fabb0d7a95e594ac8429b251bb65007

data/lib/blueshift/version.rb

@@ -1,3 +1,3 @@
 module Blueshift
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/sequel/adapters/redshift.rb

@@ -88,26 +88,25 @@ module Sequel
       def schema_parse_table(table_name, opts)
         m = output_identifier_meth(opts[:dataset])
         ds = metadata_dataset.select(:pg_attribute__attname___name,
-                                     SQL::Cast.new(:pg_attribute__atttypid, :integer).as(:oid),
-                                     SQL::Cast.new(:basetype__oid, :integer).as(:base_oid),
-                                     SQL::Function.new(:format_type, :basetype__oid, :pg_type__typtypmod).as(:db_base_type),
-                                     SQL::Function.new(:format_type, :pg_type__oid, :pg_attribute__atttypmod).as(:db_type),
-                                     SQL::Function.new(:pg_get_expr, :pg_attrdef__adbin, :pg_class__oid).as(:default),
-                                     SQL::BooleanExpression.new(:NOT, :pg_attribute__attnotnull).as(:allow_null),
-                                     SQL::Function.new(:COALESCE,
-                                                       SQL::BooleanExpression.from_value_pairs(:name => 'id'),
-                                                       schema_migrations_column_name(table_name),
-                                                       false).as(:primary_key)).
-            from(:pg_class).
-            join(:pg_attribute, :attrelid=>:oid).
-            join(:pg_type, :oid=>:atttypid).
-            left_outer_join(:pg_type___basetype, :oid=>:typbasetype).
-            left_outer_join(:pg_attrdef, :adrelid=>:pg_class__oid, :adnum=>:pg_attribute__attnum).
-            left_outer_join(:pg_index, :indrelid=>:pg_class__oid, :indisprimary=>true).
-            filter(:pg_attribute__attisdropped=>false).
-            filter{|o| o.pg_attribute__attnum > 0}.
-            filter(:pg_class__oid=>regclass_oid(table_name, opts)).
-            order(:pg_attribute__attnum)
+            SQL::Cast.new(:pg_attribute__atttypid, :integer).as(:oid),
+            SQL::Cast.new(:basetype__oid, :integer).as(:base_oid),
+            SQL::Function.new(:format_type, :basetype__oid, :pg_type__typtypmod).as(:db_base_type),
+            SQL::Function.new(:format_type, :pg_type__oid, :pg_attribute__atttypmod).as(:db_type),
+            SQL::Function.new(:pg_get_expr, :pg_attrdef__adbin, :pg_class__oid).as(:default),
+            SQL::BooleanExpression.new(:NOT, :pg_attribute__attnotnull).as(:allow_null),
+            SQL::Function.new(:COALESCE, SQL::BooleanExpression.from_value_pairs(:pg_attribute__attnum => SQL::Function.new(:ANY,
+              SQL::Function.new(:string_to_array, SQL::Function.new(:textin, SQL::Function.new(:int2vectorout, :pg_index__indkey)), ' ')
+            )), false).as(:primary_key)).
+          from(:pg_class).
+          join(:pg_attribute, :attrelid=>:oid).
+          join(:pg_type, :oid=>:atttypid).
+          left_outer_join(:pg_type___basetype, :oid=>:typbasetype).
+          left_outer_join(:pg_attrdef, :adrelid=>:pg_class__oid, :adnum=>:pg_attribute__attnum).
+          left_outer_join(:pg_index, :indrelid=>:pg_class__oid, :indisprimary=>true).
+          filter(:pg_attribute__attisdropped=>false).
+          filter{|o| o.pg_attribute__attnum > 0}.
+          filter(:pg_class__oid=>regclass_oid(table_name, opts)).
+          order(:pg_attribute__attnum)
         ds.map do |row|
           row[:default] = nil if blank_object?(row[:default])
           if row[:base_oid]
@@ -126,10 +125,6 @@ module Sequel
           [m.call(row.delete(:name)), row]
         end
       end
-
-      def schema_migrations_column_name(table_name)
-        #SQL::BooleanExpression.from_value_pairs(:name => 'filename') if table_name == :schema_migrations
-      end
     end
 
     class Dataset < Postgres::Dataset

data/lib/sequel/extensions/schema_dumper_ext.rb

@@ -2,12 +2,17 @@ require 'sequel/extensions/schema_dumper'
 module Sequel
   module SchemaDumper
     alias_method :dump_table_schema_without_force, :dump_table_schema
+    alias_method :dump_schema_migration_original, :dump_schema_migration
     alias_method :column_schema_to_ruby_type_without_uuid, :column_schema_to_ruby_type
 
     def dump_table_schema(table, opts=OPTS)
       dump_table_schema_without_force(table, opts).gsub('create_table(', 'create_table!(')
     end
 
+    def dump_schema_migration(options=OPTS)
+      dump_schema_migration_original(options).to_s.gsub(/^\s+$/, '')
+    end
+
     def column_schema_to_ruby_type(schema)
       case schema[:db_type].downcase
       when 'uuid'

data/lib/tasks/schema.rake

@@ -71,7 +71,7 @@ namespace :redshift do
   desc 'Rollback the latest applied migration for Redshift'
   task :rollback do
     Blueshift::Migration.rollback!(:redshift)
-    Rake::Task['pg:schema:dump'].invoke
+    Rake::Task['redshift:schema:dump'].invoke
   end
 end
 
@@ -81,4 +81,3 @@ namespace :blueshift do
     puts 'Running migrations for Postgres and Redshift...', ''
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue-shift
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Gabriel Mansour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Amazon Redshift adapter for Sequel