sequel-schema-sharding 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8da54e7c94ed8f3eda67c2be550c95aa722bfd3
-  data.tar.gz: 047620efbb7536b0a187b50e3d276d46539012e9
+  metadata.gz: fa175ac4af8322937a21fda859150649e9872091
+  data.tar.gz: dc40633aa45cc01bd5747610db19dffc2cd80463
 SHA512:
-  metadata.gz: 21e6938c04438c694bd04173cf53a0b7bd9d3c6677b4477909908e750e279e3b97b39984992d94feff45f7969775b1b5224ff8d2cb17aaa2e1ae41c276eb6b88
-  data.tar.gz: 8b67577bcdf9dd92391d78a6bafca000724560e96fa11b2ceec025cbc22ceb2d0fb15a585d365d0e1bc39cc5ed5eaadf2edebbda67dddc6da4e5f60d5df40cc1
+  metadata.gz: 767a816353d1ecc7ed2052c2e8885f5a19e79aac06d47e77ca92043a532c409862350b50a40310cc292c97a4757d0a9fffaf91a85f1d7eea34f183d6c49a6a58
+  data.tar.gz: e4404c3e64c7883212fbbcecf49ef585a6c6544d16264e9c1633c9eedd7069691a6895b42152c26ca78bb3ee988b194557b0ffdec400b78ce257069260c64f0e

data/lib/sequel/schema-sharding.rb

@@ -1,12 +1,13 @@
+require 'logger'
+require 'sequel'
 require 'sequel/schema-sharding/version'
 require 'sequel/schema-sharding/configuration'
 require 'sequel/schema-sharding/connection_manager'
 require 'sequel/schema-sharding/database_manager'
 require 'sequel/schema-sharding/ring'
 require 'sequel/schema-sharding/finder'
-require 'sequel/schema-sharding/sequel_ext'
+require 'sequel/schema-sharding/monkey_patching'
 require 'sequel/schema-sharding/model'
-require 'logger'
 require 'sequel/schema-sharding/logger_proxy'
 
 module Sequel

data/lib/sequel/schema-sharding/database_manager.rb

@@ -56,13 +56,11 @@ module Sequel
 
       def create_shards
         config.table_names.each do |table_name|
-          config.logical_shard_configs(table_name).each_pair do |shard_number, physical_shard|
-            schema_name = connection_manager.schema_for(table_name, shard_number)
-            Sequel::SchemaSharding.logger.info "Creating schema #{schema_name} on #{physical_shard}.."
-            connection = connection_manager.master(physical_shard)
+          SchemaIterator.new.iterate_on(table_name) do |conn, schema_name, table_name|
+            Sequel::SchemaSharding.logger.warn "Creating schema #{schema_name}.."
 
             begin
-              connection.run("CREATE SCHEMA #{schema_name}")
+              conn.run("CREATE SCHEMA #{schema_name}")
             rescue Sequel::DatabaseError => e
               if e.message.include?('already exists')
                 $stderr.puts "#{schema_name} schema already exists"
@@ -71,26 +69,46 @@ module Sequel
               end
             end
 
-            connection.run("SET search_path TO #{schema_name}")
-
-            Sequel::Migrator.run(connection, Sequel::SchemaSharding.migration_path + "/#{table_name}", :use_transactions => true)
+            migrator_for(conn, schema_name, table_name).run
           end
         end
       end
 
       def drop_shards
         config.table_names.each do |table_name|
-          config.logical_shard_configs(table_name).each_pair do |shard_number, physical_shard|
-            schema_name = connection_manager.schema_for(table_name, shard_number)
-            Sequel::SchemaSharding.logger.info "Dropping schema #{schema_name} on #{physical_shard}.."
-            connection = connection_manager[physical_shard]
-            connection.run("DROP SCHEMA #{schema_name} CASCADE")
+          SchemaIterator.new.iterate_on(table_name) do |conn, schema_name, table_name|
+            Sequel::SchemaSharding.logger.warn "Dropping schema #{schema_name}.."
+            conn.run("DROP SCHEMA #{schema_name} CASCADE")
           end
         end
       end
 
+      def migrate(table_name, migration_options = {})
+        SchemaIterator.new.iterate_on(table_name) do |conn, schema_name, table_name|
+          Sequel::SchemaSharding.logger.warn "Migrating #{table_name} in schema #{schema_name}.."
+          migrator_for(conn, schema_name, table_name, migration_options).run
+        end
+      end
+
+      def rollback(table_name, migration_options = {})
+        SchemaIterator.new.iterate_on(table_name) do |conn, schema_name, table_name|
+          Sequel::SchemaSharding.logger.warn "Rolling back #{table_name} in schema #{schema_name}.."
+          migrator = migrator_for(conn, schema_name, table_name, {direction: :down}.merge(migration_options))
+          # :((((((((((((((((((((((
+          migrator.instance_variable_set(:@target, migrator.current - 1)
+          migrator.instance_variable_set(:@direction, :down)
+          migrator.run
+        end
+      end
+
       private
 
+      def migrator_for(connection, schema, table_name, options = {})
+        path = Sequel::SchemaSharding.migration_path + "/#{table_name}"
+        connection.migration_current_schema = schema
+        Sequel::Migrator.migrator_class(path).new(connection, path, { table: connection.migration_schema_for_table(:schema_info)}.merge(options))
+      end
+
       def env
         config.env
       end
@@ -105,3 +123,5 @@ module Sequel
     end
   end
 end
+
+require 'sequel/schema-sharding/database_manager/schema_iterator'

data/lib/sequel/schema-sharding/database_manager/schema_iterator.rb

@@ -0,0 +1,20 @@
+class Sequel::SchemaSharding::DatabaseManager::SchemaIterator
+  def iterate_on(table_name, &block)
+    config.logical_shard_configs(table_name).each_pair do |shard_number, physical_shard|
+      schema_name = connection_manager.schema_for(table_name, shard_number)
+      connection = connection_manager.master(physical_shard)
+
+      yield connection, schema_name, table_name
+    end
+  end
+
+  private
+
+  def config
+    Sequel::SchemaSharding.config
+  end
+
+  def connection_manager
+    Sequel::SchemaSharding.connection_manager
+  end
+end

data/lib/sequel/schema-sharding/extensions/migrations_ext.rb

@@ -0,0 +1,26 @@
+# These are non-nasty (hopefully) extensions to the sequel
+# migration code to support explicitly passing Postgres schemas.
+
+module Sequel
+  module SchemaSharding
+    module Extensions
+      module MigrationsExt
+        def self.included(base)
+          base.class_eval do
+            attr_accessor :migration_current_schema
+          end
+        end
+
+        def migration_schema_for_table(table)
+          :"#{migration_current_schema}__#{table}"
+        end
+      end
+    end
+  end
+end
+
+module Sequel
+  class Database
+    include Sequel::SchemaSharding::Extensions::MigrationsExt
+  end
+end

data/lib/sequel/schema-sharding/extensions/sequel_ext.rb

@@ -0,0 +1,16 @@
+module Sequel
+  module SchemaSharding
+    module Extensions
+      module SequelExt
+        module ClassMethods
+          def db
+            return @db if @db
+          end
+        end
+      end
+    end
+  end
+end
+
+Sequel::Model.plugin Sequel::SchemaSharding::Extensions::SequelExt
+Sequel::Model.plugin :validation_helpers

data/lib/sequel/schema-sharding/monkey_patching.rb

@@ -0,0 +1,2 @@
+require 'sequel/schema-sharding/extensions/migrations_ext'
+require 'sequel/schema-sharding/extensions/sequel_ext'

data/lib/sequel/schema-sharding/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module SchemaSharding
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/spec/fixtures/db/migrate/artists/001_create_test_table.rb

@@ -1,6 +1,6 @@
 Sequel.migration do
   up do
-    create_table(:artists) do
+    create_table(migration_schema_for_table(:artists)) do
       primary_key :id
       Integer :artist_id
       String :name, :null=>false

data/spec/fixtures/db/migrate/boof/001_create_boof_table.rb

@@ -1,6 +1,6 @@
 Sequel.migration do
   up do
-    create_table(:boofs) do
+    create_table(migration_schema_for_table(:boofs)) do
       primary_key :id
       String :name, :null=>false
     end

data/spec/fixtures/db/other_migrate/artists/002_create_test_index.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    add_index(migration_schema_for_table(:artists), :name, concurrently: true)
+  end
+
+  down do
+    drop_index(migration_schema_for_table(:artists), :name, concurrently: true)
+  end
+end

data/spec/schema-sharding/database_manager/schema_iterator_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Sequel::SchemaSharding::DatabaseManager::SchemaIterator do
+  subject { Sequel::SchemaSharding::DatabaseManager::SchemaIterator.new }
+
+  describe '#iterate_on' do
+    let(:expector) { stub }
+
+    it 'calls the given block with the connection, schema, and table name for each shard' do
+      expector.expects(:boom).times(20).with(kind_of(Sequel::Database), kind_of(String), 'artists')
+
+      subject.iterate_on('artists') do |*args|
+        expector.boom(*args)
+      end
+    end
+  end
+end

data/spec/schema-sharding/database_manager_spec.rb

@@ -121,4 +121,37 @@ describe Sequel::SchemaSharding::DatabaseManager, type: :manager, sharded: true
       end
     end
   end
+
+  describe 'schema migrations' do
+    before(:each) do
+      @manager.create_databases
+      @manager.create_shards
+    end
+
+    before do
+      Sequel::SchemaSharding.migration_path = "spec/fixtures/db/other_migrate"
+    end
+
+    after do
+      Sequel::SchemaSharding.migration_path = "spec/fixtures/db/migrate"
+    end
+
+    describe '#migrate' do
+      it 'runs migrations against the table on all schemas' do
+        expect(DatabaseHelper.index_count('shard1', 'sequel_explosions_artists_01', 'artists', 'name')).to eq(0)
+        @manager.migrate('artists', allow_missing_migration_files: true, use_transactions: false, current: 1)
+        expect(DatabaseHelper.index_count('shard1', 'sequel_explosions_artists_01', 'artists', 'name')).to eq(1)
+      end
+    end
+
+    describe '#rollback' do
+      it 'runs migrations against the table on all schemas' do
+        expect(DatabaseHelper.index_count('shard1', 'sequel_explosions_artists_01', 'artists', 'name')).to eq(0)
+        @manager.migrate('artists', allow_missing_migration_files: true, use_transactions: false, current: 1)
+        expect(DatabaseHelper.index_count('shard1', 'sequel_explosions_artists_01', 'artists', 'name')).to eq(1)
+        @manager.rollback('artists', allow_missing_migration_files: true, use_transactions: false, current: 1)
+        expect(DatabaseHelper.index_count('shard1', 'sequel_explosions_artists_01', 'artists', 'name')).to eq(0)
+      end
+    end
+  end
 end

data/spec/support/database_helper.rb

@@ -29,6 +29,12 @@ class DatabaseHelper
     schemas(database).include?(schema)
   end
 
+  def self.index_count(database, schema, table, column)
+    Sequel::SchemaSharding.connection_manager[database]
+                          .fetch("select * from pg_catalog.pg_indexes where tablename = '#{table}' and schemaname = '#{schema}' and indexdef LIKE '%#{column}%'")
+                          .count
+  end
+
   def self.schemas(database)
     Sequel::SchemaSharding.connection_manager[database].fetch('select nspname from pg_catalog.pg_namespace;').all.map { |d| d[:nspname] }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-schema-sharding
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Paul Henry
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -108,19 +108,24 @@ files:
 - lib/sequel/schema-sharding/configuration.rb
 - lib/sequel/schema-sharding/connection_manager.rb
 - lib/sequel/schema-sharding/database_manager.rb
+- lib/sequel/schema-sharding/database_manager/schema_iterator.rb
+- lib/sequel/schema-sharding/extensions/migrations_ext.rb
+- lib/sequel/schema-sharding/extensions/sequel_ext.rb
 - lib/sequel/schema-sharding/finder.rb
 - lib/sequel/schema-sharding/logger_proxy.rb
 - lib/sequel/schema-sharding/model.rb
+- lib/sequel/schema-sharding/monkey_patching.rb
 - lib/sequel/schema-sharding/ring.rb
-- lib/sequel/schema-sharding/sequel_ext.rb
 - lib/sequel/schema-sharding/version.rb
 - lib/sequel/tasks/test.rake
 - sequel-schema-sharding.gemspec
 - spec/fixtures/db/migrate/artists/001_create_test_table.rb
 - spec/fixtures/db/migrate/boof/001_create_boof_table.rb
+- spec/fixtures/db/other_migrate/artists/002_create_test_index.rb
 - spec/fixtures/test_db_config.yml
 - spec/schema-sharding/configuration_spec.rb
 - spec/schema-sharding/connection_manager_spec.rb
+- spec/schema-sharding/database_manager/schema_iterator_spec.rb
 - spec/schema-sharding/database_manager_spec.rb
 - spec/schema-sharding/finder_spec.rb
 - spec/schema-sharding/model_spec.rb
@@ -154,9 +159,11 @@ summary: Create horizontally sharded Sequel models with Postgres
 test_files:
 - spec/fixtures/db/migrate/artists/001_create_test_table.rb
 - spec/fixtures/db/migrate/boof/001_create_boof_table.rb
+- spec/fixtures/db/other_migrate/artists/002_create_test_index.rb
 - spec/fixtures/test_db_config.yml
 - spec/schema-sharding/configuration_spec.rb
 - spec/schema-sharding/connection_manager_spec.rb
+- spec/schema-sharding/database_manager/schema_iterator_spec.rb
 - spec/schema-sharding/database_manager_spec.rb
 - spec/schema-sharding/finder_spec.rb
 - spec/schema-sharding/model_spec.rb

data/lib/sequel/schema-sharding/sequel_ext.rb

@@ -1,14 +0,0 @@
-module Sequel
-  module SchemaSharding
-    module SequelExt
-      module ClassMethods
-        def db
-          return @db if @db
-        end
-      end
-    end
-  end
-end
-
-Sequel::Model.plugin Sequel::SchemaSharding::SequelExt
-Sequel::Model.plugin :validation_helpers