diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-07-14 23:27:57 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-07-14 23:27:57 +0930 |
| commit | 55c1b1dc5adb86920b66e6acc30ddd41a7da3ce8 (patch) | |
| tree | b6f9e4c62abbb37d4b70b29e30e209a089fb2901 | |
| parent | defc68004d2a8d3d66d5f4893e34ba9917d97e83 (diff) | |
| parent | fc4680425817a5fcfbaba970201fecee7cb8491d (diff) | |
| download | rails-55c1b1dc5adb86920b66e6acc30ddd41a7da3ce8.tar.gz rails-55c1b1dc5adb86920b66e6acc30ddd41a7da3ce8.tar.bz2 rails-55c1b1dc5adb86920b66e6acc30ddd41a7da3ce8.zip | |
Merge pull request #16167 from yahonda/ora972_faces
Address ORA-00972: identifier is too long when tested with Oracle
| -rw-r--r-- | activerecord/test/models/face.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/models/man.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/schema/schema.rb | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/test/models/face.rb b/activerecord/test/models/face.rb index 3d7f0626e2..91e46f83e5 100644 --- a/activerecord/test/models/face.rb +++ b/activerecord/test/models/face.rb @@ -1,7 +1,8 @@ class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face belongs_to :polymorphic_man, :polymorphic => true, :inverse_of => :polymorphic_face - belongs_to :polymorphic_man_without_inverse, :polymorphic => true + # Oracle identifier lengh is limited to 30 bytes or less, `polymorphic` renamed `poly` + belongs_to :poly_man_without_inverse, :polymorphic => true # These is a "broken" inverse_of for the purposes of testing belongs_to :horrible_man, :class_name => 'Man', :inverse_of => :horrible_face belongs_to :horrible_polymorphic_man, :polymorphic => true, :inverse_of => :horrible_polymorphic_face diff --git a/activerecord/test/models/man.rb b/activerecord/test/models/man.rb index a26491ce61..4fbb6b226b 100644 --- a/activerecord/test/models/man.rb +++ b/activerecord/test/models/man.rb @@ -1,7 +1,7 @@ class Man < ActiveRecord::Base has_one :face, :inverse_of => :man has_one :polymorphic_face, :class_name => 'Face', :as => :polymorphic_man, :inverse_of => :polymorphic_man - has_one :polymorphic_face_without_inverse, :class_name => 'Face', :as => :polymorphic_man_without_inverse + has_one :polymorphic_face_without_inverse, :class_name => 'Face', :as => :poly_man_without_inverse has_many :interests, :inverse_of => :man has_many :polymorphic_interests, :class_name => 'Interest', :as => :polymorphic_man, :inverse_of => :polymorphic_man # These are "broken" inverse_of associations for the purposes of testing diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 932c9ba5d9..146190fc19 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -781,8 +781,8 @@ ActiveRecord::Schema.define do t.integer :man_id t.integer :polymorphic_man_id t.string :polymorphic_man_type - t.integer :polymorphic_man_without_inverse_id - t.string :polymorphic_man_without_inverse_type + t.integer :poly_man_without_inverse_id + t.string :poly_man_without_inverse_type t.integer :horrible_polymorphic_man_id t.string :horrible_polymorphic_man_type end |