rein 0.8.2 → 0.8.3

data/lib/rein/constraint/foreign_key.rb

@@ -4,7 +4,7 @@ module RC
       referencing_attribute = (options[:referencing] || "#{referenced_table.to_s.singularize}_id").to_sym
       referenced_attribute  = (options[:referenced] || "id").to_sym
 
-      name = (options[:name] || "#{referencing_attribute}_fk").to_sym
+      name = options[:name] || default_constraint_name(referencing_table, referencing_attribute)
 
       sql = "ALTER TABLE #{referencing_table}".tap do |sql|
         sql << " ADD CONSTRAINT #{name}"
@@ -24,7 +24,7 @@ module RC
     def remove_foreign_key_constraint(referencing_table, referenced_table, options = {})
       referencing_attribute = options[:referencing] || "#{referenced_table.to_s.singularize}_id".to_sym
 
-      name = options[:name] || "#{referencing_attribute}_fk".to_sym
+      name = options[:name] || default_constraint_name(referencing_table, referencing_attribute)
 
       if is_a_mysql_adapter?
         execute "ALTER TABLE #{referencing_table} DROP FOREIGN KEY #{name}"
@@ -58,5 +58,9 @@ module RC
     def is_a_mysql_adapter?
       self.class.to_s =~ /Mysql[2]?Adapter/
     end
+
+    def default_constraint_name(referencing_table, referencing_attribute)
+      "#{referencing_table}_#{referencing_attribute}_fk".to_sym
+    end
   end
 end

data/lib/rein/version.rb

@@ -1,3 +1,3 @@
 module Rein
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/rein/constraint/foreign_key_spec.rb

@@ -17,22 +17,22 @@ describe RC::ForeignKey do
 
     context "with no options" do
       before { adapter.add_foreign_key_constraint(:books, :people) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id)") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (id)") }
     end
 
     context "with a given referencing attribute" do
       before { adapter.add_foreign_key_constraint(:books, :people, :referencing => :author_id) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT author_id_fk FOREIGN KEY (author_id) REFERENCES people (id)") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_author_id_fk FOREIGN KEY (author_id) REFERENCES people (id)") }
     end
 
     context "with a given referenced attribute" do
       before { adapter.add_foreign_key_constraint(:books, :people, :referenced => :person_id) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (person_id)") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (person_id)") }
     end
 
     context "with a given referencing attribute and referenced attribute" do
       before { adapter.add_foreign_key_constraint(:books, :people, :referencing => :author_id, :referenced => :person_id) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT author_id_fk FOREIGN KEY (author_id) REFERENCES people (person_id)") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_author_id_fk FOREIGN KEY (author_id) REFERENCES people (person_id)") }
     end
 
     context "with a given name" do
@@ -42,22 +42,22 @@ describe RC::ForeignKey do
 
     context "with a given on delete referential action" do
       before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :cascade) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE") }
     end
 
     context "with a given on update referential action" do
       before { adapter.add_foreign_key_constraint(:books, :people, :on_update => :cascade) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON UPDATE CASCADE") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON UPDATE CASCADE") }
     end
 
     context "with a 'cascade' on delete and update referential action" do
       before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :cascade, :on_update => :cascade) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE ON UPDATE CASCADE") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE CASCADE ON UPDATE CASCADE") }
     end
 
     context "with a 'no action' on delete and update referential action" do
       before { adapter.add_foreign_key_constraint(:books, :people, :on_delete => :no_action, :on_update => :no_action) }
-      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE NO ACTION ON UPDATE NO ACTION") }
+      it { should have_received.execute("ALTER TABLE books ADD CONSTRAINT books_person_id_fk FOREIGN KEY (person_id) REFERENCES people (id) ON DELETE NO ACTION ON UPDATE NO ACTION") }
     end
 
     describe "with a given add_index option" do
@@ -81,12 +81,12 @@ describe RC::ForeignKey do
 
     context "with no options" do
       before { adapter.remove_foreign_key_constraint(:books, :people) }
-      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT person_id_fk") }
+      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT books_person_id_fk") }
     end
 
     context "with a given referencing attribute" do
       before { adapter.remove_foreign_key_constraint(:books, :people, :referencing => :author_id) }
-      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT author_id_fk") }
+      it { should have_received.execute("ALTER TABLE books DROP CONSTRAINT books_author_id_fk") }
     end
 
     context "with a given name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rein
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,18 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2852352367581315615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2852352367581315615
 requirements: []
 rubyforge_project: rein
 rubygems_version: 1.8.23