blue-shift 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0bb5cec279a6d30fcd817b2a267e87d1e32cac3
-  data.tar.gz: 4af59446089a1b34753495df831bcb804f2d190c
+  metadata.gz: 854cfe4464d33859954cd59b31e0aab3416ff3c3
+  data.tar.gz: 36e046e96ca8f013b9a1dcfed1017334f2a2c4a1
 SHA512:
-  metadata.gz: eaa9e257e759e9bd4041f6d49335d4f6e46fac9b8f114ef152ce05fcea98dcf71b5d11c53375dfce50d9a75320159d52e88eb89cb2cf2b0a88ff4bf0fa8ee23e
-  data.tar.gz: 11b6e0785d57ad8cbd8482f47f4090d90ebc9fbe17d064b7d37206cc6e3c2e2ae437708ff06ec2f63aa166012c8c91e58384908e9e5d044fcd56db1c7d2a61a9
+  metadata.gz: 5a3dacb4ab8e472434905142c1f1ffe344a269cc80e1e8194524bc10b80c1dddeab08677be3ff2961f463b8da3de0a36170a12a6614b771759d5c1b0da959e32
+  data.tar.gz: f3969bf286f9e125c1d621e8bcab8e4ada926757d688844ee6888b1b7ac6b601c8436fb442a20e5887d9a6a5fef6216b5dee71af5f5b2518659f15eaebb9c72a

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 - `:diststyle` => `:even` (implicit default), `:key`, or `:all`
 
-    The Distribution Style. When `:distkey` is also specified, only `:key` DISTSTYLE is supported by Redshift.
+    The Distribution Style. When `:distkey` is also specified, only `:key` DISTSTYLE is supported by Redshift and will be ignored by Postgres
 
 - `:sortkeys` => a list of column names
 
@@ -43,7 +43,7 @@ Or install it yourself as:
 For example:
 
 ```ruby
-create_table :chocolates, distkey: :region, diststyle: :all, sortkeys: [:richness, :organic], sortstyle: :interleaved do
+create_table :chocolates, distkey: :region, diststyle: :key, sortkeys: [:richness, :organic], sortstyle: :interleaved do
     String  :region
     Integer :richness
     boolean :organic
@@ -51,8 +51,14 @@ create_table :chocolates, distkey: :region, diststyle: :all, sortkeys: [:richnes
 end
 ```
 
+You can also redeclare the sortkeys for an existing table by using the `optimize_table` method. This is reconstructive, no additive. For example:
 
-### Migrations (coming soon)
+```ruby
+optimize_table :chocolates, sortkeys: [:organic, :region], distkey: :region 
+```
+
+
+### Migrations
 
 Blueshift unifies migrations for your Postgres and Redshift databases into one file. Postgres migrations and Redshift migrations use Sequel.
 
@@ -93,6 +99,28 @@ Blueshift.migration do
   reddown {}
 end
 ```
+
+#### Transactions
+
+By default, each migration runs within a transaction.
+You can manually specify to disable transactions on a per migration basis. For example, if you want to not force
+transaction use for a particular migration, call the `no_transaction` method in the `Blueshift.migration` block:
+
+```ruby
+Blueshift.migration do
+  no_transaction
+  up do
+    # ...
+  end
+end
+```
+
+This is necessary in some cases, such as when attempting to use `CREATE INDEX CONCURRENTLY`
+on PostgreSQL (which supports transactional schema, but not that statement inside a transaction).
+
+Also, because each `optimize_table` call gets run within its own transaction, you should probably
+use no_transaction in migrations that use that in order to prevent starting multiple transactions
+within one another.
        
 ## Development
 

data/lib/blue-shift.rb

@@ -0,0 +1 @@
+require_relative 'blueshift'

data/lib/blueshift/migration.rb

@@ -5,9 +5,11 @@ require 'logger'
 module Blueshift
   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'))
+  DBS = { pg: POSTGRES_DB, redshift: REDSHIFT_DB }
 
   class Migration
-    attr_reader :postgres_migration, :redshift_migration, :use_transactions
+    attr_reader :postgres_migration, :redshift_migration
+    attr_accessor :use_transactions
     MIGRATION_DIR = File.join(Dir.pwd, 'db/migrations')
     SCHEMA_TABLE  = :schema_migrations
     SCHEMA_COLUMN = :filename
@@ -38,6 +40,10 @@ module Blueshift
       redshift_migration.down = block
     end
 
+    def no_transaction
+      self.use_transactions = false
+    end
+
     def apply(db, direction)
       if db.is_a?(Sequel::Redshift::Database)
         redshift_migration.apply(db, direction)
@@ -47,12 +53,12 @@ module Blueshift
     end
 
     class << self
-      def run_pg!
-        Sequel::Migrator.run(POSTGRES_DB, MIGRATION_DIR)
+      def run_pg!(options = {})
+        Sequel::Migrator.run(POSTGRES_DB, MIGRATION_DIR, options)
       end
 
-      def run_redshift!
-        Sequel::Migrator.run(REDSHIFT_DB, MIGRATION_DIR)
+      def run_redshift!(options = {})
+        Sequel::Migrator.run(REDSHIFT_DB, MIGRATION_DIR, options)
       end
 
       def run_both!
@@ -60,6 +66,11 @@ module Blueshift
         run_redshift!
       end
 
+      def rollback!(db_type)
+        target = Sequel::TimestampMigrator.new(DBS[db_type], MIGRATION_DIR).applied_migrations[-2].to_i
+        public_send("run_#{db_type}!", target: target)
+      end
+
       def insert_into_schema_migrations(db)
         ds = schema_dataset(db)
         ds.delete

data/lib/blueshift/version.rb

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

data/lib/sequel/adapters/postgres_ext.rb

@@ -7,7 +7,6 @@ module Sequel
       def type_literal_generic_suuid(column)
         column[:fixed] = true
         column[:size] = 36
-        column[:null] ||= false
         type_literal_generic_string(column)
       end
     end

data/lib/tasks/schema.rake

@@ -34,6 +34,12 @@ namespace :pg do
     Blueshift::Migration.run_pg!
     Rake::Task['pg:schema:dump'].invoke
   end
+
+  desc 'Rollback the latest applied migration for Postgres'
+  task :rollback do
+    Blueshift::Migration.rollback!(:pg)
+    Rake::Task['pg:schema:dump'].invoke
+  end
 end
 
 
@@ -61,6 +67,12 @@ namespace :redshift do
     Blueshift::Migration.run_redshift!
     Rake::Task['redshift:schema:dump'].invoke
   end
+
+  desc 'Rollback the latest applied migration for Redshift'
+  task :rollback do
+    Blueshift::Migration.rollback!(:redshift)
+    Rake::Task['pg:schema:dump'].invoke
+  end
 end
 
 namespace :blueshift do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue-shift
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Gabriel Mansour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -114,7 +114,7 @@ files:
 - bin/console
 - bin/setup
 - blueshift.gemspec
-- db/migrations/dummy_migration.rb
+- lib/blue-shift.rb
 - lib/blueshift.rb
 - lib/blueshift/migration.rb
 - lib/blueshift/railtie.rb