Merge pull request #16181 from yahonda/ora972_faces_41

Address ORA-00972: identifier is too long when tested with Oracle
rails · Jul 15, 2014 · 9e5cab2 · 9e5cab2
2 parents 08e528d + c5ab350
commit 9e5cab2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -775,8 +775,8 @@ def create_table(*args, &block)
     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