blue-shift 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08f528b72fb07122fc5ad99a01f63c2c7a9ceae
-  data.tar.gz: e8e92411017effb0f76ce135ff5852e0ebfddc04
+  metadata.gz: 2ba2efeff34013ecda9d1470847300d4c4672fef
+  data.tar.gz: 1084eda477b23e024194b0786ee5a52014d72ee6
 SHA512:
-  metadata.gz: 94a782bf567eace61d3538e18ff461c6668ad5dd31d5e0e9ab95949edd07eb79b9a721f5774dfbe5085629271e8561eacf8f25aefe4037c398997a2b77616dc1
-  data.tar.gz: f6c9574934c71434abeb1e368ad67f011fa9d79d41775d573459f200962ad598b4a65221d7cd3110629afdf164a30db012e2a81320d23ca608db3f379fa46692
+  metadata.gz: 6fa65136a66fb3283351223c052fcc84cb58cccdd5687af8d5b9e0f2bc6b2e264342f78251e64d7f2ef5893e342ee89ce827e2ab8671c8829bd641cd7a8a8d35
+  data.tar.gz: ed64339075b3032198be0e039c576f5bee471add340a7f122d46159cc72f7c824ad89f4087c686633de81096750afa880fcf271bd9e776210c78e3bf2e19cc89

data/lib/blueshift/migration.rb

@@ -3,14 +3,14 @@ require 'sequel/extensions/migration'
 require 'logger'
 
 module Blueshift
-  REDSHIFT_DB = Sequel.connect(ENV.fetch('REDSHIFT_URL'), logger: Logger.new('redshift.log'))
-  POSTGRES_DB = Sequel.connect(ENV.fetch('DATABASE_URL'), logger: Logger.new('postgres.log'))
+  REDSHIFT_DB = Sequel.connect(ENV.fetch('REDSHIFT_URL', 'redshift://'), logger: Logger.new('redshift.log'))
+  POSTGRES_DB = Sequel.connect(ENV.fetch('DATABASE_URL', 'postgres://'), logger: Logger.new('postgres.log'))
 
   class Migration
     attr_reader :postgres_migration, :redshift_migration, :use_transactions
     MIGRATION_DIR = File.join(Dir.pwd, 'db/migrations')
-    SCHEMA_COLUMN = :filename
     SCHEMA_TABLE  = :schema_migrations
+    SCHEMA_COLUMN = :filename
 
     def initialize(&block)
       @postgres_migration = Sequel::SimpleMigration.new
@@ -46,15 +46,6 @@ module Blueshift
       end
     end
 
-    def self.insert_into_schema_migrations(db)
-      db.from(SCHEMA_TABLE).delete
-      migration_files = Dir["#{MIGRATION_DIR}/*"]
-      migration_files.each do |path|
-        f = File.basename(path)
-        db.from(SCHEMA_TABLE).insert(SCHEMA_COLUMN=>f)
-      end
-    end
-
     class << self
       def run_pg!
         Sequel::Migrator.run(POSTGRES_DB, MIGRATION_DIR)
@@ -68,6 +59,24 @@ module Blueshift
         run_pg!
         run_redshift!
       end
+
+      def insert_into_schema_migrations(db)
+        ds = schema_dataset(db)
+        ds.delete
+        migration_files = Dir["#{MIGRATION_DIR}/*"]
+        migration_files.each do |path|
+          f = File.basename(path)
+          ds.insert(SCHEMA_COLUMN=>f)
+        end
+      end
+
+      def schema_dataset(db)
+        ds = db.from(SCHEMA_TABLE)
+        unless db.table_exists?(SCHEMA_TABLE)
+          db.create_table(SCHEMA_TABLE) { String SCHEMA_COLUMN, primary_key: true }
+        end
+        ds
+      end
     end
 
     private

data/lib/blueshift/version.rb

@@ -1,3 +1,3 @@
 module Blueshift
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/sequel/adapters/redshift.rb

@@ -77,7 +77,10 @@ module Sequel
                                      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'), false).as(:primary_key)).
+                                     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).
@@ -107,6 +110,9 @@ module Sequel
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue-shift
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Gabriel Mansour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel