connection_manager 0.2.3 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/connection_manager/cross_schema_patch.rb +3 -4
  3. data/lib/connection_manager/version.rb +1 -1
  4. metadata +15 -15
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- connection_manager (0.2.3)
4
+ connection_manager (0.2.4)
5
5
  activerecord (~> 3.0)
6
6
 
7
7
  GEM
data/lib/connection_manager/cross_schema_patch.rb CHANGED
@@ -92,9 +92,9 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
92
92
  [aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key]), as_conditions].reject{ |x| x.blank? }
93
93
  end
94
94
  when :belongs_to
95
- #aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name]), as_conditions].reject{ |x| x.blank? }
95
+ [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name] || find_belongs_to_arel_column(parent_table)), as_conditions].reject{ |x| x.blank? }
96
96
 
97
- [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(find_belongs_to_arel_column(parent_table)), as_conditions].reject{ |x| x.blank? }
97
+ #[aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(find_belongs_to_arel_column(parent_table)), as_conditions].reject{ |x| x.blank? }
98
98
 
99
99
  end
100
100
 
@@ -110,8 +110,7 @@ if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
110
110
  end
111
111
 
112
112
  def find_belongs_to_arel_column(parent_table)
113
- parent_table.columns.select{|c| (c.name == options[:foreign_key].to_sym)}[0] ||
114
- parent_table.columns.select{|c| (c.name == reflection.primary_key_name.to_sym)}[0]
113
+ parent_table.columns.select{|c| (c.name == (options[:foreign_key] || reflection.primary_key_name).to_sym)}[0]
115
114
  end
116
115
  end
117
116
  end
data/lib/connection_manager/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module ConnectionManager
2
- VERSION = "0.2.3"
2
+ VERSION = "0.2.4"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: connection_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-11 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord
16
- requirement: &70240984637260 !ruby/object:Gem::Requirement
16
+ requirement: &70141007740340 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70240984637260
24
+ version_requirements: *70141007740340
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sqlite3
27
- requirement: &70240984636840 !ruby/object:Gem::Requirement
27
+ requirement: &70141007739920 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70240984636840
35
+ version_requirements: *70141007739920
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &70240984636380 !ruby/object:Gem::Requirement
38
+ requirement: &70141007770420 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70240984636380
46
+ version_requirements: *70141007770420
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: autotest
49
- requirement: &70240984635960 !ruby/object:Gem::Requirement
49
+ requirement: &70141007770000 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70240984635960
57
+ version_requirements: *70141007770000
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mocha
60
- requirement: &70240984635540 !ruby/object:Gem::Requirement
60
+ requirement: &70141007769580 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70240984635540
68
+ version_requirements: *70141007769580
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: factory_girl
71
- requirement: &70240984635120 !ruby/object:Gem::Requirement
71
+ requirement: &70141007769160 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70240984635120
79
+ version_requirements: *70141007769160
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mysql2
82
- requirement: &70240984634700 !ruby/object:Gem::Requirement
82
+ requirement: &70141007768740 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70240984634700
90
+ version_requirements: *70141007768740
91
91
  description: Simplifies connecting to Muliple and Replication databases with rails
92
92
  and active_record
93
93
  email: