active_record_shards 3.6.1 → 3.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/active_record_shards/configuration_parser.rb +5 -5
- data/lib/active_record_shards/connection_switcher.rb +5 -5
- data/lib/active_record_shards/migration.rb +5 -4
- data/lib/active_record_shards/schema_cache_extension.rb +34 -0
- data/lib/active_record_shards/shard_selection.rb +4 -3
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f22328837e48da3dbf1b805e69a7f65ad8ae431b
|
4
|
+
data.tar.gz: 5f64e2de4f4d9b2ec578a7086ca1b343199692af
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1208459ce41631737cc65189ffe6fe94bad6e7441442cb61330647308a3422c8475fbf2d84a63549493c23eda176b6a70476a7a5dffc7f68f25608e0d2b3061e
|
7
|
+
data.tar.gz: 40f8b499653ef50efe49fb465c69b021f29069997df42a037788893673c03eb22d1651d1e17df281f1abba83a82b1bb9fa49bc9ada607138c5fa11243dc1dcc0
|
@@ -39,12 +39,12 @@ module ActiveRecordShards
|
|
39
39
|
self.configurations_without_shard_explosion = explode(conf)
|
40
40
|
end
|
41
41
|
|
42
|
-
def
|
43
|
-
|
44
|
-
|
45
|
-
|
42
|
+
def self.extended(base)
|
43
|
+
base.singleton_class.send(:alias_method, :configurations_without_shard_explosion=, :configurations=)
|
44
|
+
base.singleton_class.send(:alias_method, :configurations=, :configurations_with_shard_explosion=)
|
45
|
+
base.singleton_class.send(:public, :configurations=)
|
46
46
|
|
47
|
-
|
47
|
+
base.configurations = base.configurations if base.configurations.present?
|
48
48
|
end
|
49
49
|
end
|
50
50
|
end
|
@@ -4,12 +4,12 @@ module ActiveRecordShards
|
|
4
4
|
module ConnectionSwitcher
|
5
5
|
SHARD_NAMES_CONFIG_KEY = 'shard_names'.freeze
|
6
6
|
|
7
|
-
def self.extended(
|
8
|
-
|
9
|
-
|
7
|
+
def self.extended(base)
|
8
|
+
base.singleton_class.send(:alias_method, :columns_without_default_shard, :columns)
|
9
|
+
base.singleton_class.send(:alias_method, :columns, :columns_with_default_shard)
|
10
10
|
|
11
|
-
|
12
|
-
|
11
|
+
base.singleton_class.send(:alias_method, :table_exists_without_default_shard?, :table_exists?)
|
12
|
+
base.singleton_class.send(:alias_method, :table_exists?, :table_exists_with_default_shard?)
|
13
13
|
end
|
14
14
|
|
15
15
|
def default_shard=(new_default_shard)
|
@@ -101,16 +101,17 @@ module ActiveRecordShards
|
|
101
101
|
|
102
102
|
migrate_without_forced_shard(direction)
|
103
103
|
end
|
104
|
+
|
105
|
+
def migration_shard
|
106
|
+
self.class.migration_shard
|
107
|
+
end
|
104
108
|
end
|
105
109
|
end
|
106
110
|
|
107
111
|
ActiveRecord::Migration.class_eval do
|
108
112
|
extend ActiveRecordShards::MigrationClassExtension
|
109
|
-
|
110
113
|
include ActiveRecordShards::ActualMigrationExtension
|
111
|
-
|
112
|
-
self.class.migration_shard
|
113
|
-
end
|
114
|
+
|
114
115
|
alias_method :migrate_without_forced_shard, :migrate
|
115
116
|
alias_method :migrate, :migrate_with_forced_shard
|
116
117
|
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
unless (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR > 2) || ActiveRecord::VERSION::MAJOR > 4
|
2
|
+
ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
|
3
|
+
attr_accessor :schema_cache
|
4
|
+
|
5
|
+
private
|
6
|
+
|
7
|
+
alias :original_new_connection :new_connection
|
8
|
+
|
9
|
+
def new_connection
|
10
|
+
original_new_connection.tap do |connection|
|
11
|
+
if schema_cache
|
12
|
+
connection.schema_cache = schema_cache.dup
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
ActiveRecord::ConnectionAdapters::SchemaCache.class_eval do
|
19
|
+
def initialize_dup(other)
|
20
|
+
super
|
21
|
+
|
22
|
+
@columns = @columns.dup
|
23
|
+
@columns_hash = @columns_hash.dup
|
24
|
+
@primary_keys = @primary_keys.dup
|
25
|
+
@tables = @tables.dup
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
unless ActiveRecord::VERSION::MAJOR > 4
|
31
|
+
ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
|
32
|
+
attr_writer :schema_cache
|
33
|
+
end
|
34
|
+
end
|
@@ -33,9 +33,10 @@ module ActiveRecordShards
|
|
33
33
|
the_shard = shard(klass)
|
34
34
|
|
35
35
|
@shard_names ||= {}
|
36
|
-
@shard_names[
|
37
|
-
@shard_names[
|
38
|
-
@shard_names[the_shard][try_slave]
|
36
|
+
@shard_names[ActiveRecordShards.rails_env] ||= {}
|
37
|
+
@shard_names[ActiveRecordShards.rails_env][the_shard] ||= {}
|
38
|
+
@shard_names[ActiveRecordShards.rails_env][the_shard][try_slave] ||= {}
|
39
|
+
@shard_names[ActiveRecordShards.rails_env][the_shard][try_slave][@on_slave] ||= begin
|
39
40
|
s = ActiveRecordShards.rails_env.dup
|
40
41
|
s << "_shard_#{the_shard}" if the_shard
|
41
42
|
s << "_slave" if @on_slave && try_slave
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_record_shards
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.6.
|
4
|
+
version: 3.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mick Staugaard
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2016-
|
13
|
+
date: 2016-02-02 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: activerecord
|
@@ -170,6 +170,7 @@ files:
|
|
170
170
|
- lib/active_record_shards/default_slave_patches.rb
|
171
171
|
- lib/active_record_shards/migration.rb
|
172
172
|
- lib/active_record_shards/model.rb
|
173
|
+
- lib/active_record_shards/schema_cache_extension.rb
|
173
174
|
- lib/active_record_shards/schema_dumper_extension.rb
|
174
175
|
- lib/active_record_shards/shard_selection.rb
|
175
176
|
- lib/active_record_shards/shard_support.rb
|