blue-shift 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9541a96cc11b59a2d3d4f0186f3149be133b7137
-  data.tar.gz: 77ac01b0820cd0f28405ee87a0e73d4fec88597f
+  metadata.gz: 491693564e9c51d5a965ea7136447851027d93bb
+  data.tar.gz: 5d9e331a804a4a52295690a3c97fc8173273da8f
 SHA512:
-  metadata.gz: cb4e2f82e887ed74b4dc01e5ef8f88361fea131def1747176e321b340d397f356af27c1ba080c8a199d6f04d9b48544811468dd2d64d87ca39e5d5fbed4abf34
-  data.tar.gz: 60cd4af5dbe206989acc7724edf066bc947e289a1acdbef4dff0cb58e9946d66b8f7a3d9ed93640cd844901e54eadb4d379c93ddcdae508c22e4d3e909210f7a
+  metadata.gz: 5ba7a3d381c8dfb2d1108ee981b2b29c635a8f19d379db642ebe47ffb7c742dcd87c6febf9b1ca72c6c669fd7397cddbfca64e5b1ff1142b0b301923936e4f24
+  data.tar.gz: ee01aa14691d1ce4ab192131a2586dc42f64a23a088d021ca815543e634d94cc655b988d0fa11e350ccfd8f505e903685ae0cf16b197dc76da0c989ad6410feb

data/lib/blueshift.rb

@@ -3,6 +3,7 @@ require 'blueshift/version'
 require 'blueshift/migration'
 require 'sequel'
 require 'sequel/adapters/redshift'
+require 'sequel/extensions/schema_dumper_ext'
 
 module Blueshift
   def self.migration(&block)

data/lib/blueshift/migration.rb

@@ -9,6 +9,8 @@ module Blueshift
   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
 
     def initialize(&block)
       @postgres_migration = Sequel::SimpleMigration.new
@@ -44,13 +46,21 @@ module Blueshift
       end
     end
 
+    def self.insert_into_schema_migrations(db)
+      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, column: :postgres_version)
+        Sequel::Migrator.run(POSTGRES_DB, MIGRATION_DIR)
       end
 
       def run_redshift!
-        Sequel::Migrator.run(REDSHIFT_DB, MIGRATION_DIR, column: :redshift_version)
+        Sequel::Migrator.run(REDSHIFT_DB, MIGRATION_DIR)
       end
 
       def run_both!

data/lib/blueshift/version.rb

@@ -1,3 +1,3 @@
 module Blueshift
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/sequel/extensions/redshift_schema_dumper.rb

@@ -9,7 +9,7 @@ module Sequel
         gen = dump_table_generator(table, options)
         commands = [gen.dump_columns, gen.dump_constraints, gen.dump_indexes].reject { |x| x == '' }.join("\n\n")
 
-        "create_table(#{table.inspect}#{table_options(table, gen, options)}) do\n#{commands.gsub(/^/o, '  ')}\nend"
+        "create_table!(#{table.inspect}#{table_options(table, gen, options)}) do\n#{commands.gsub(/^/o, '  ')}\nend"
       end
 
       def table_options(table, gen, options)

data/lib/sequel/extensions/schema_dumper_ext.rb

@@ -0,0 +1,10 @@
+require 'sequel/extensions/schema_dumper'
+module Sequel
+  module SchemaDumper
+    alias_method :dump_table_schema_without_force, :dump_table_schema
+
+    def dump_table_schema(table, opts=OPTS)
+      dump_table_schema_without_force(table, opts).gsub('create_table(', 'create_table!(')
+    end
+  end
+end

data/lib/tasks/schema.rake

@@ -15,13 +15,16 @@ namespace :pg do
     desc 'Dumps the Postgres schema to a file'
     task :dump => :ensure_db_dir do
       Blueshift::POSTGRES_DB.extension :schema_dumper
-      File.open(File.join(path, 'schema.rb'), 'w') { |f| f << Blueshift::POSTGRES_DB.dump_schema_migration(same_db: true) }
+      File.open(File.join(path, 'schema.rb'), 'w') { |f| f << Blueshift::POSTGRES_DB.dump_schema_migration(same_db: false) }
     end
 
     desc 'Loads the Postgres schema from the file to the database'
     task :load => :ensure_db_dir do
-      eval(File.read(File.join(path, 'schema.rb'))).apply(Blueshift::POSTGRES_DB, :up)
+      migration = eval(File.read(File.join(path, 'schema.rb')))
+      migration.apply(Blueshift::POSTGRES_DB, :up)
       puts 'loaded schema into Postgres'
+      Blueshift::Migration.insert_into_schema_migrations(Blueshift::POSTGRES_DB)
+      puts 'inserted schema migrations entries'
     end
   end
 
@@ -29,6 +32,7 @@ namespace :pg do
   task :migrate do
     Blueshift::POSTGRES_DB.logger = logger
     Blueshift::Migration.run_pg!
+    rake 'pg:schema:dump'
   end
 end
 
@@ -43,8 +47,11 @@ namespace :redshift do
 
     desc 'Loads the Postgres schema from the file to the database'
     task :load => :ensure_db_dir do
-      eval(File.read(File.join(path, 'schema_redshift.rb'))).apply(Blueshift::REDSHIFT_DB, :up)
+      migration = eval(File.read(File.join(path, 'schema_redshift.rb')))
+      migration.apply(Blueshift::REDSHIFT_DB, :up)
       puts 'loaded schema into Redshift'
+      Blueshift::Migration.insert_into_schema_migrations(Blueshift::REDSHIFT_DB)
+      puts 'inserted schema migrations entries'
     end
   end
 
@@ -52,16 +59,17 @@ namespace :redshift do
   task :migrate do
     Blueshift::REDSHIFT_DB.logger = logger
     Blueshift::Migration.run_redshift!
+    rake 'redshift:schema:dump'
   end
 end
 
 namespace :blueshift do
   desc 'Runs migrations for both Postgres and Redshift'
-  task :migrate do
+  task :migrate => ['pg:migrate', 'redshift:migrate'] do
     puts 'Running migrations for Postgres and Redshift...', ''
-    Blueshift::POSTGRES_DB.logger = logger
-    Blueshift::REDSHIFT_DB.logger = logger
-    Blueshift::Migration.run_both!
   end
+
+  desc 'dummy'
+  task(:dummy) {}
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue-shift
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Mansour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -114,6 +114,7 @@ files:
 - bin/console
 - bin/setup
 - blueshift.gemspec
+- db/migrations/dummy_migration.rb
 - lib/blueshift.rb
 - lib/blueshift/migration.rb
 - lib/blueshift/railtie.rb
@@ -122,6 +123,7 @@ files:
 - lib/sequel/adapters/postgres_ext.rb
 - lib/sequel/adapters/redshift.rb
 - lib/sequel/extensions/redshift_schema_dumper.rb
+- lib/sequel/extensions/schema_dumper_ext.rb
 - lib/tasks/generate_migration.rake
 - lib/tasks/schema.rake
 homepage: https://github.com/influitive/blueshift
@@ -143,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Amazon Redshift adapter for Sequel