composite_primary_keys 13.0.1 → 14.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.rdoc +8 -2
- data/README.rdoc +1 -0
- data/Rakefile +37 -37
- data/lib/composite_primary_keys/arel/sqlserver.rb +37 -37
- data/lib/composite_primary_keys/arel/to_sql.rb +18 -18
- data/lib/composite_primary_keys/associations/association.rb +23 -23
- data/lib/composite_primary_keys/associations/collection_association.rb +31 -31
- data/lib/composite_primary_keys/associations/foreign_association.rb +15 -15
- data/lib/composite_primary_keys/associations/has_many_association.rb +35 -35
- data/lib/composite_primary_keys/associations/preloader/association.rb +68 -53
- data/lib/composite_primary_keys/associations/through_association.rb +25 -25
- data/lib/composite_primary_keys/autosave_association.rb +60 -60
- data/lib/composite_primary_keys/composite_arrays.rb +86 -86
- data/lib/composite_primary_keys/composite_predicates.rb +71 -70
- data/lib/composite_primary_keys/composite_relation.rb +29 -29
- data/lib/composite_primary_keys/connection_adapters/abstract_adapter.rb +10 -10
- data/lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb +26 -26
- data/lib/composite_primary_keys/counter_cache.rb +15 -15
- data/lib/composite_primary_keys/fixtures.rb +21 -21
- data/lib/composite_primary_keys/persistence.rb +21 -7
- data/lib/composite_primary_keys/relation/calculations.rb +7 -1
- data/lib/composite_primary_keys/sanitization.rb +42 -42
- data/lib/composite_primary_keys/transactions.rb +34 -34
- data/lib/composite_primary_keys/validations/uniqueness.rb +31 -31
- data/lib/composite_primary_keys/version.rb +1 -1
- data/lib/composite_primary_keys.rb +1 -1
- data/scripts/console.rb +48 -48
- data/scripts/txt2html +76 -76
- data/scripts/txt2js +65 -65
- data/tasks/databases/mysql.rake +40 -40
- data/tasks/databases/oracle.rake +41 -41
- data/tasks/databases/postgresql.rake +38 -38
- data/tasks/databases/sqlite.rake +25 -25
- data/tasks/databases/sqlserver.rake +43 -43
- data/tasks/website.rake +18 -18
- data/test/README_tests.rdoc +56 -56
- data/test/abstract_unit.rb +5 -1
- data/test/connections/connection_spec.rb +27 -27
- data/test/connections/databases.example.yml +40 -40
- data/test/connections/databases.yml +40 -39
- data/test/fixtures/article.rb +10 -10
- data/test/fixtures/articles.yml +7 -7
- data/test/fixtures/capitol.rb +3 -3
- data/test/fixtures/capitols.yml +16 -16
- data/test/fixtures/comment.rb +5 -5
- data/test/fixtures/comments.yml +17 -17
- data/test/fixtures/dorm.rb +2 -2
- data/test/fixtures/dorms.yml +4 -4
- data/test/fixtures/employee.rb +5 -5
- data/test/fixtures/group.rb +2 -2
- data/test/fixtures/groups.yml +6 -6
- data/test/fixtures/membership_status.rb +2 -2
- data/test/fixtures/membership_statuses.yml +16 -16
- data/test/fixtures/memberships.yml +10 -10
- data/test/fixtures/product.rb +9 -9
- data/test/fixtures/product_tariff.rb +5 -5
- data/test/fixtures/product_tariffs.yml +14 -14
- data/test/fixtures/products.yml +11 -11
- data/test/fixtures/reading.rb +4 -4
- data/test/fixtures/readings.yml +10 -10
- data/test/fixtures/reference_code.rb +7 -7
- data/test/fixtures/reference_codes.yml +28 -28
- data/test/fixtures/reference_type.rb +12 -12
- data/test/fixtures/reference_types.yml +9 -9
- data/test/fixtures/restaurant.rb +9 -9
- data/test/fixtures/restaurants.yml +14 -14
- data/test/fixtures/restaurants_suburb.rb +2 -2
- data/test/fixtures/room.rb +11 -11
- data/test/fixtures/room_assignment.rb +13 -13
- data/test/fixtures/room_assignments.yml +24 -24
- data/test/fixtures/room_attribute.rb +2 -2
- data/test/fixtures/room_attribute_assignment.rb +4 -4
- data/test/fixtures/room_attribute_assignments.yml +4 -4
- data/test/fixtures/room_attributes.yml +2 -2
- data/test/fixtures/rooms.yml +12 -12
- data/test/fixtures/street.rb +2 -2
- data/test/fixtures/student.rb +3 -3
- data/test/fixtures/students.yml +15 -15
- data/test/fixtures/suburb.rb +5 -5
- data/test/fixtures/tariff.rb +5 -5
- data/test/fixtures/tariffs.yml +14 -14
- data/test/fixtures/topic_sources.yml +3 -3
- data/test/fixtures/topics.yml +8 -8
- data/test/fixtures/users.yml +10 -10
- data/test/plugins/pagination.rb +405 -405
- data/test/plugins/pagination_helper.rb +135 -135
- data/test/test_attribute_methods.rb +63 -63
- data/test/test_callbacks.rb +99 -99
- data/test/test_composite_arrays.rb +38 -38
- data/test/test_counter_cache.rb +30 -30
- data/test/test_dumpable.rb +15 -15
- data/test/test_dup.rb +37 -37
- data/test/test_equal.rb +26 -26
- data/test/test_habtm.rb +141 -141
- data/test/test_miscellaneous.rb +32 -32
- data/test/test_optimistic.rb +18 -18
- data/test/test_pagination.rb +35 -35
- data/test/test_polymorphic.rb +43 -43
- data/test/test_predicates.rb +59 -59
- data/test/test_preload.rb +102 -102
- data/test/test_santiago.rb +23 -23
- data/test/test_touch.rb +23 -23
- data/test/test_tutorial_example.rb +25 -25
- data/test/test_validations.rb +13 -13
- metadata +6 -6
data/test/abstract_unit.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
spec_name = ENV['ADAPTER'] || '
|
1
|
+
spec_name = ENV['ADAPTER'] || 'postgresql'
|
2
2
|
require 'bundler'
|
3
3
|
require 'minitest/autorun'
|
4
4
|
|
@@ -21,6 +21,10 @@ ActiveRecord::Base.configurations = {test: spec}
|
|
21
21
|
|
22
22
|
# Tell ActiveRecord where to find models
|
23
23
|
ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
|
24
|
+
Dir[File.join(PROJECT_ROOT, 'test', 'fixtures', '*.rb')].each do |file_path|
|
25
|
+
require_file = file_path.sub(PROJECT_ROOT, '..').sub('.rb', '')
|
26
|
+
require_relative require_file
|
27
|
+
end
|
24
28
|
|
25
29
|
I18n.config.enforce_available_locales = true
|
26
30
|
|
@@ -1,27 +1,27 @@
|
|
1
|
-
require 'yaml'
|
2
|
-
require 'erb'
|
3
|
-
|
4
|
-
module CompositePrimaryKeys
|
5
|
-
class ConnectionSpec
|
6
|
-
def self.[](adapter)
|
7
|
-
config[adapter.to_s].dup
|
8
|
-
end
|
9
|
-
|
10
|
-
private
|
11
|
-
|
12
|
-
def self.config
|
13
|
-
@config ||= begin
|
14
|
-
# Find the file location
|
15
|
-
path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
|
16
|
-
|
17
|
-
# Run any erb code
|
18
|
-
template = ERB.new(File.read(path))
|
19
|
-
project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
|
20
|
-
data = template.result(binding)
|
21
|
-
|
22
|
-
# And now to YAML
|
23
|
-
YAML.load(data)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
1
|
+
require 'yaml'
|
2
|
+
require 'erb'
|
3
|
+
|
4
|
+
module CompositePrimaryKeys
|
5
|
+
class ConnectionSpec
|
6
|
+
def self.[](adapter)
|
7
|
+
config[adapter.to_s].dup
|
8
|
+
end
|
9
|
+
|
10
|
+
private
|
11
|
+
|
12
|
+
def self.config
|
13
|
+
@config ||= begin
|
14
|
+
# Find the file location
|
15
|
+
path = File.join(PROJECT_ROOT, 'test', 'connections', 'databases.yml')
|
16
|
+
|
17
|
+
# Run any erb code
|
18
|
+
template = ERB.new(File.read(path))
|
19
|
+
project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
|
20
|
+
data = template.result(binding)
|
21
|
+
|
22
|
+
# And now to YAML
|
23
|
+
YAML.load(data)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -1,40 +1,40 @@
|
|
1
|
-
# To run tests:
|
2
|
-
# 1. Copy this file to test/connections/databases.yml.
|
3
|
-
# 2. Update to match the databases you want to test against.
|
4
|
-
|
5
|
-
ibm_db:
|
6
|
-
database: ocdpdev
|
7
|
-
username: db2inst1
|
8
|
-
password: password
|
9
|
-
host: localhost
|
10
|
-
|
11
|
-
mysql:
|
12
|
-
adapter: mysql2
|
13
|
-
username: root
|
14
|
-
password: mysql
|
15
|
-
database: composite_primary_keys_unittest
|
16
|
-
|
17
|
-
oracle:
|
18
|
-
adapter: oracle_enhanced
|
19
|
-
database: xe
|
20
|
-
username: SYSTEM
|
21
|
-
password: oracle
|
22
|
-
host: localhost
|
23
|
-
|
24
|
-
postgresql:
|
25
|
-
adapter: postgresql
|
26
|
-
database: composite_primary_keys_unittest
|
27
|
-
username: postgres
|
28
|
-
host: localhost
|
29
|
-
|
30
|
-
sqlite:
|
31
|
-
adapter: sqlite3
|
32
|
-
database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
|
33
|
-
|
34
|
-
sqlserver:
|
35
|
-
adapter: sqlserver
|
36
|
-
username: cpk
|
37
|
-
password: cpk
|
38
|
-
database: composite_primary_keys_unittest
|
39
|
-
host: localhost
|
40
|
-
port: 1433
|
1
|
+
# To run tests:
|
2
|
+
# 1. Copy this file to test/connections/databases.yml.
|
3
|
+
# 2. Update to match the databases you want to test against.
|
4
|
+
|
5
|
+
ibm_db:
|
6
|
+
database: ocdpdev
|
7
|
+
username: db2inst1
|
8
|
+
password: password
|
9
|
+
host: localhost
|
10
|
+
|
11
|
+
mysql:
|
12
|
+
adapter: mysql2
|
13
|
+
username: root
|
14
|
+
password: mysql
|
15
|
+
database: composite_primary_keys_unittest
|
16
|
+
|
17
|
+
oracle:
|
18
|
+
adapter: oracle_enhanced
|
19
|
+
database: xe
|
20
|
+
username: SYSTEM
|
21
|
+
password: oracle
|
22
|
+
host: localhost
|
23
|
+
|
24
|
+
postgresql:
|
25
|
+
adapter: postgresql
|
26
|
+
database: composite_primary_keys_unittest
|
27
|
+
username: postgres
|
28
|
+
host: localhost
|
29
|
+
|
30
|
+
sqlite:
|
31
|
+
adapter: sqlite3
|
32
|
+
database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
|
33
|
+
|
34
|
+
sqlserver:
|
35
|
+
adapter: sqlserver
|
36
|
+
username: cpk
|
37
|
+
password: cpk
|
38
|
+
database: composite_primary_keys_unittest
|
39
|
+
host: localhost
|
40
|
+
port: 1433
|
@@ -1,39 +1,40 @@
|
|
1
|
-
# To run tests:
|
2
|
-
# 1. Copy this file to test/connections/databases.yml.
|
3
|
-
# 2. Update to match the databases you want to test against.
|
4
|
-
|
5
|
-
ibm_db:
|
6
|
-
database: ocdpdev
|
7
|
-
username: db2inst1
|
8
|
-
password: password
|
9
|
-
host: localhost
|
10
|
-
|
11
|
-
mysql:
|
12
|
-
adapter: mysql2
|
13
|
-
username: root
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
1
|
+
# To run tests:
|
2
|
+
# 1. Copy this file to test/connections/databases.yml.
|
3
|
+
# 2. Update to match the databases you want to test against.
|
4
|
+
|
5
|
+
ibm_db:
|
6
|
+
database: ocdpdev
|
7
|
+
username: db2inst1
|
8
|
+
password: password
|
9
|
+
host: localhost
|
10
|
+
|
11
|
+
mysql:
|
12
|
+
adapter: mysql2
|
13
|
+
username: root
|
14
|
+
password: mysql
|
15
|
+
database: composite_primary_keys_unittest
|
16
|
+
|
17
|
+
oracle:
|
18
|
+
adapter: oracle_enhanced
|
19
|
+
database: xe
|
20
|
+
username: SYSTEM
|
21
|
+
password: oracle
|
22
|
+
host: localhost
|
23
|
+
|
24
|
+
postgresql:
|
25
|
+
adapter: postgresql
|
26
|
+
database: composite_primary_keys_unittest
|
27
|
+
username: postgres
|
28
|
+
host: localhost
|
29
|
+
|
30
|
+
sqlite:
|
31
|
+
adapter: sqlite3
|
32
|
+
database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
|
33
|
+
|
34
|
+
sqlserver:
|
35
|
+
adapter: sqlserver
|
36
|
+
username: cpk
|
37
|
+
password: cpk
|
38
|
+
database: composite_primary_keys_unittest
|
39
|
+
host: localhost
|
40
|
+
port: 1433
|
data/test/fixtures/article.rb
CHANGED
@@ -1,10 +1,10 @@
|
|
1
|
-
class Article < ActiveRecord::Base
|
2
|
-
validates :id, uniqueness: true, numericality: true, allow_nil: true, allow_blank: true, on: :create
|
3
|
-
has_many :readings, :dependent => :delete_all
|
4
|
-
has_many :users, :through => :readings
|
5
|
-
|
6
|
-
has_many :comments, :dependent => :delete_all
|
7
|
-
has_many :employee_commentators, :through => :comments, :source => :person, :source_type => :employee
|
8
|
-
has_many :user_commentators, :through => :comments, :source => :person, :source_type => "User"
|
9
|
-
end
|
10
|
-
|
1
|
+
class Article < ActiveRecord::Base
|
2
|
+
validates :id, uniqueness: true, numericality: true, allow_nil: true, allow_blank: true, on: :create
|
3
|
+
has_many :readings, :dependent => :delete_all
|
4
|
+
has_many :users, :through => :readings
|
5
|
+
|
6
|
+
has_many :comments, :dependent => :delete_all
|
7
|
+
has_many :employee_commentators, :through => :comments, :source => :person, :source_type => :employee
|
8
|
+
has_many :user_commentators, :through => :comments, :source => :person, :source_type => "User"
|
9
|
+
end
|
10
|
+
|
data/test/fixtures/articles.yml
CHANGED
@@ -1,8 +1,8 @@
|
|
1
|
-
first:
|
2
|
-
name: Article One
|
3
|
-
|
4
|
-
second:
|
5
|
-
name: Article Two
|
6
|
-
|
7
|
-
third:
|
1
|
+
first:
|
2
|
+
name: Article One
|
3
|
+
|
4
|
+
second:
|
5
|
+
name: Article Two
|
6
|
+
|
7
|
+
third:
|
8
8
|
name: Article Three
|
data/test/fixtures/capitol.rb
CHANGED
@@ -1,3 +1,3 @@
|
|
1
|
-
class Capitol < ActiveRecord::Base
|
2
|
-
self.primary_keys = :country, :city
|
3
|
-
end
|
1
|
+
class Capitol < ActiveRecord::Base
|
2
|
+
self.primary_keys = :country, :city
|
3
|
+
end
|
data/test/fixtures/capitols.yml
CHANGED
@@ -1,16 +1,16 @@
|
|
1
|
-
netherlands:
|
2
|
-
country: The Netherlands
|
3
|
-
city: Amsterdam
|
4
|
-
|
5
|
-
france:
|
6
|
-
country: France
|
7
|
-
city: Paris
|
8
|
-
|
9
|
-
canada:
|
10
|
-
country: Canada
|
11
|
-
city: Ottawa
|
12
|
-
|
13
|
-
mexico:
|
14
|
-
country: Mexico
|
15
|
-
city: Mexico City
|
16
|
-
|
1
|
+
netherlands:
|
2
|
+
country: The Netherlands
|
3
|
+
city: Amsterdam
|
4
|
+
|
5
|
+
france:
|
6
|
+
country: France
|
7
|
+
city: Paris
|
8
|
+
|
9
|
+
canada:
|
10
|
+
country: Canada
|
11
|
+
city: Ottawa
|
12
|
+
|
13
|
+
mexico:
|
14
|
+
country: Mexico
|
15
|
+
city: Mexico City
|
16
|
+
|
data/test/fixtures/comment.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
class Comment < ActiveRecord::Base
|
2
|
-
belongs_to :person, :polymorphic => true
|
3
|
-
belongs_to :article
|
4
|
-
end
|
5
|
-
|
1
|
+
class Comment < ActiveRecord::Base
|
2
|
+
belongs_to :person, :polymorphic => true
|
3
|
+
belongs_to :article
|
4
|
+
end
|
5
|
+
|
data/test/fixtures/comments.yml
CHANGED
@@ -1,17 +1,17 @@
|
|
1
|
-
employee_comment:
|
2
|
-
id: 1
|
3
|
-
article: first
|
4
|
-
person_id: 1
|
5
|
-
person_type: Employee
|
6
|
-
|
7
|
-
user_comment_1:
|
8
|
-
id: 2
|
9
|
-
article: second
|
10
|
-
person_id: 1
|
11
|
-
person_type: User
|
12
|
-
|
13
|
-
user_comment_2:
|
14
|
-
id: 3
|
15
|
-
article: second
|
16
|
-
person_id: 2
|
17
|
-
person_type: User
|
1
|
+
employee_comment:
|
2
|
+
id: 1
|
3
|
+
article: first
|
4
|
+
person_id: 1
|
5
|
+
person_type: Employee
|
6
|
+
|
7
|
+
user_comment_1:
|
8
|
+
id: 2
|
9
|
+
article: second
|
10
|
+
person_id: 1
|
11
|
+
person_type: User
|
12
|
+
|
13
|
+
user_comment_2:
|
14
|
+
id: 3
|
15
|
+
article: second
|
16
|
+
person_id: 2
|
17
|
+
person_type: User
|
data/test/fixtures/dorm.rb
CHANGED
@@ -1,3 +1,3 @@
|
|
1
|
-
class Dorm < ActiveRecord::Base
|
2
|
-
has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
|
1
|
+
class Dorm < ActiveRecord::Base
|
2
|
+
has_many :rooms, -> {includes(:room_attributes)}, :primary_key => [:id]
|
3
3
|
end
|
data/test/fixtures/dorms.yml
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
branner:
|
2
|
-
id: 1
|
3
|
-
|
4
|
-
toyon:
|
1
|
+
branner:
|
2
|
+
id: 1
|
3
|
+
|
4
|
+
toyon:
|
5
5
|
id: 2
|
data/test/fixtures/employee.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
class Employee < ActiveRecord::Base
|
2
|
-
belongs_to :department, :foreign_key => [:department_id, :location_id]
|
3
|
-
has_many :comments, :as => :person
|
4
|
-
has_and_belongs_to_many :groups
|
5
|
-
end
|
1
|
+
class Employee < ActiveRecord::Base
|
2
|
+
belongs_to :department, :foreign_key => [:department_id, :location_id]
|
3
|
+
has_many :comments, :as => :person
|
4
|
+
has_and_belongs_to_many :groups
|
5
|
+
end
|
data/test/fixtures/group.rb
CHANGED
@@ -1,3 +1,3 @@
|
|
1
|
-
class Group < ActiveRecord::Base
|
2
|
-
has_many :memberships
|
1
|
+
class Group < ActiveRecord::Base
|
2
|
+
has_many :memberships
|
3
3
|
end
|
data/test/fixtures/groups.yml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
cpk:
|
2
|
-
id: 1
|
3
|
-
name: Composite Primary Keys
|
4
|
-
|
5
|
-
group2:
|
6
|
-
id: 2
|
1
|
+
cpk:
|
2
|
+
id: 1
|
3
|
+
name: Composite Primary Keys
|
4
|
+
|
5
|
+
group2:
|
6
|
+
id: 2
|
7
7
|
name: Grupo Dos
|
@@ -1,3 +1,3 @@
|
|
1
|
-
class MembershipStatus < ActiveRecord::Base
|
2
|
-
belongs_to :membership, :foreign_key => [:user_id, :group_id]
|
1
|
+
class MembershipStatus < ActiveRecord::Base
|
2
|
+
belongs_to :membership, :foreign_key => [:user_id, :group_id]
|
3
3
|
end
|
@@ -1,17 +1,17 @@
|
|
1
|
-
santiago-cpk:
|
2
|
-
id: 1
|
3
|
-
user_id: 1
|
4
|
-
group_id: 1
|
5
|
-
status: Active
|
6
|
-
|
7
|
-
drnic-cpk:
|
8
|
-
id: 2
|
9
|
-
user_id: 2
|
10
|
-
group_id: 1
|
11
|
-
status: Owner
|
12
|
-
|
13
|
-
cfis-cpk:
|
14
|
-
id: 3
|
15
|
-
user_id: 3
|
16
|
-
group_id: 2
|
1
|
+
santiago-cpk:
|
2
|
+
id: 1
|
3
|
+
user_id: 1
|
4
|
+
group_id: 1
|
5
|
+
status: Active
|
6
|
+
|
7
|
+
drnic-cpk:
|
8
|
+
id: 2
|
9
|
+
user_id: 2
|
10
|
+
group_id: 1
|
11
|
+
status: Owner
|
12
|
+
|
13
|
+
cfis-cpk:
|
14
|
+
id: 3
|
15
|
+
user_id: 3
|
16
|
+
group_id: 2
|
17
17
|
status: Active
|
@@ -1,11 +1,11 @@
|
|
1
|
-
santiago-cpk:
|
2
|
-
user_id: 1
|
3
|
-
group_id: 1
|
4
|
-
|
5
|
-
drnic-cpk:
|
6
|
-
user_id: 2
|
7
|
-
group_id: 1
|
8
|
-
|
9
|
-
cfis-cpk:
|
10
|
-
user_id: 3
|
1
|
+
santiago-cpk:
|
2
|
+
user_id: 1
|
3
|
+
group_id: 1
|
4
|
+
|
5
|
+
drnic-cpk:
|
6
|
+
user_id: 2
|
7
|
+
group_id: 1
|
8
|
+
|
9
|
+
cfis-cpk:
|
10
|
+
user_id: 3
|
11
11
|
group_id: 2
|
data/test/fixtures/product.rb
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
class Product < ActiveRecord::Base
|
2
|
-
self.primary_keys = :id # redundant
|
3
|
-
has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
|
4
|
-
has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
-
|
6
|
-
has_and_belongs_to_many :restaurants,
|
7
|
-
:foreign_key => :product_id,
|
8
|
-
:association_foreign_key => [:franchise_id, :store_id]
|
9
|
-
end
|
1
|
+
class Product < ActiveRecord::Base
|
2
|
+
self.primary_keys = :id # redundant
|
3
|
+
has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
|
4
|
+
has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
+
|
6
|
+
has_and_belongs_to_many :restaurants,
|
7
|
+
:foreign_key => :product_id,
|
8
|
+
:association_foreign_key => [:franchise_id, :store_id]
|
9
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
class ProductTariff < ActiveRecord::Base
|
2
|
-
self.primary_keys = :product_id, :tariff_id, :tariff_start_date
|
3
|
-
belongs_to :product, :foreign_key => :product_id
|
4
|
-
belongs_to :tariff, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
-
end
|
1
|
+
class ProductTariff < ActiveRecord::Base
|
2
|
+
self.primary_keys = :product_id, :tariff_id, :tariff_start_date
|
3
|
+
belongs_to :product, :foreign_key => :product_id
|
4
|
+
belongs_to :tariff, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
+
end
|
@@ -1,14 +1,14 @@
|
|
1
|
-
first_flat:
|
2
|
-
product_id: 1
|
3
|
-
tariff_id: 1
|
4
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
5
|
-
|
6
|
-
first_free:
|
7
|
-
product_id: 1
|
8
|
-
tariff_id: 2
|
9
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
10
|
-
|
11
|
-
second_free:
|
12
|
-
product_id: 2
|
13
|
-
tariff_id: 2
|
14
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
1
|
+
first_flat:
|
2
|
+
product_id: 1
|
3
|
+
tariff_id: 1
|
4
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
5
|
+
|
6
|
+
first_free:
|
7
|
+
product_id: 1
|
8
|
+
tariff_id: 2
|
9
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
10
|
+
|
11
|
+
second_free:
|
12
|
+
product_id: 2
|
13
|
+
tariff_id: 2
|
14
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
data/test/fixtures/products.yml
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
first_product:
|
2
|
-
id: 1
|
3
|
-
name: Product One
|
4
|
-
|
5
|
-
second_product:
|
6
|
-
id: 2
|
7
|
-
name: Product Two
|
8
|
-
|
9
|
-
third_product:
|
10
|
-
id: 3
|
11
|
-
name: Product Three
|
1
|
+
first_product:
|
2
|
+
id: 1
|
3
|
+
name: Product One
|
4
|
+
|
5
|
+
second_product:
|
6
|
+
id: 2
|
7
|
+
name: Product Two
|
8
|
+
|
9
|
+
third_product:
|
10
|
+
id: 3
|
11
|
+
name: Product Three
|
data/test/fixtures/reading.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
class Reading < ActiveRecord::Base
|
2
|
-
belongs_to :article
|
3
|
-
belongs_to :user
|
4
|
-
end
|
1
|
+
class Reading < ActiveRecord::Base
|
2
|
+
belongs_to :article
|
3
|
+
belongs_to :user
|
4
|
+
end
|
data/test/fixtures/readings.yml
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
santiago_first:
|
2
|
-
id: 1
|
3
|
-
user_id: 1
|
4
|
-
article: first
|
5
|
-
rating: 4
|
6
|
-
|
7
|
-
santiago_second:
|
8
|
-
id: 2
|
9
|
-
user_id: 1
|
10
|
-
article: second
|
1
|
+
santiago_first:
|
2
|
+
id: 1
|
3
|
+
user_id: 1
|
4
|
+
article: first
|
5
|
+
rating: 4
|
6
|
+
|
7
|
+
santiago_second:
|
8
|
+
id: 2
|
9
|
+
user_id: 1
|
10
|
+
article: second
|
11
11
|
rating: 5
|
@@ -1,7 +1,7 @@
|
|
1
|
-
class ReferenceCode < ActiveRecord::Base
|
2
|
-
self.primary_keys = :reference_type_id, :reference_code
|
3
|
-
|
4
|
-
belongs_to :reference_type, :foreign_key => "reference_type_id"
|
5
|
-
|
6
|
-
validates_presence_of :reference_code, :code_label, :abbreviation
|
7
|
-
end
|
1
|
+
class ReferenceCode < ActiveRecord::Base
|
2
|
+
self.primary_keys = :reference_type_id, :reference_code
|
3
|
+
|
4
|
+
belongs_to :reference_type, :foreign_key => "reference_type_id"
|
5
|
+
|
6
|
+
validates_presence_of :reference_code, :code_label, :abbreviation
|
7
|
+
end
|
@@ -1,29 +1,29 @@
|
|
1
|
-
name_prefix_mr:
|
2
|
-
reference_type_id: 1
|
3
|
-
reference_code: 1
|
4
|
-
code_label: MR
|
5
|
-
abbreviation: Mr
|
6
|
-
|
7
|
-
name_prefix_mrs:
|
8
|
-
reference_type_id: 1
|
9
|
-
reference_code: 2
|
10
|
-
code_label: MRS
|
11
|
-
abbreviation: Mrs
|
12
|
-
|
13
|
-
name_prefix_ms:
|
14
|
-
reference_type_id: 1
|
15
|
-
reference_code: 3
|
16
|
-
code_label: MS
|
17
|
-
abbreviation: Ms
|
18
|
-
|
19
|
-
gender_male:
|
20
|
-
reference_type_id: 2
|
21
|
-
reference_code: 1
|
22
|
-
code_label: MALE
|
23
|
-
abbreviation: Male
|
24
|
-
|
25
|
-
gender_female:
|
26
|
-
reference_type_id: 2
|
27
|
-
reference_code: 2
|
28
|
-
code_label: FEMALE
|
1
|
+
name_prefix_mr:
|
2
|
+
reference_type_id: 1
|
3
|
+
reference_code: 1
|
4
|
+
code_label: MR
|
5
|
+
abbreviation: Mr
|
6
|
+
|
7
|
+
name_prefix_mrs:
|
8
|
+
reference_type_id: 1
|
9
|
+
reference_code: 2
|
10
|
+
code_label: MRS
|
11
|
+
abbreviation: Mrs
|
12
|
+
|
13
|
+
name_prefix_ms:
|
14
|
+
reference_type_id: 1
|
15
|
+
reference_code: 3
|
16
|
+
code_label: MS
|
17
|
+
abbreviation: Ms
|
18
|
+
|
19
|
+
gender_male:
|
20
|
+
reference_type_id: 2
|
21
|
+
reference_code: 1
|
22
|
+
code_label: MALE
|
23
|
+
abbreviation: Male
|
24
|
+
|
25
|
+
gender_female:
|
26
|
+
reference_type_id: 2
|
27
|
+
reference_code: 2
|
28
|
+
code_label: FEMALE
|
29
29
|
abbreviation: Female
|