mini_record 0.3.0.a → 0.3.0.b

data/README.md

@@ -165,11 +165,6 @@ class Fox < ActiveRecord::Base
 end
 ```
 
-## Warnings
-
-This software is not super well tested in a production project.
-Im stated to using it in two customer's projects without any problem.
-
 ## Author
 
 DAddYE, you can follow me on twitter [@daddye](http://twitter.com/daddye) or take a look at my site [daddye.it](http://www.daddye.it)
@@ -188,4 +183,4 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/mini_record/auto_schema.rb

@@ -118,29 +118,32 @@ module MiniRecord
           # Generate fields from associations
           if reflect_on_all_associations.any?
             reflect_on_all_associations.each do |association|
-              id_key = if association.options[:foreign_key]
-                association.options[:foreign_key]
-              else
-                "#{association.name.to_s}_id".to_sym
-              end
-              type_key = "#{association.name.to_s}_type".to_sym
+              foreign_key = association.options[:foreign_key] || "#{association.name.to_s}_id"
+              type_key    = "#{association.name.to_s}_type"
               case association.macro
               when :belongs_to
-                table_definition.send(:integer, id_key)
+                table_definition.column(foreign_key, :integer)
                 if association.options[:polymorphic]
-                  table_definition.send(:string, type_key)
-                  add_index [id_key, type_key]
+                  table_definition.column(type_key, :string)
+                  add_index [foreign_key, type_key]
                 else
-                  add_index id_key
+                  add_index foreign_key
                 end
               when :has_and_belongs_to_many
-                table = [table_name, association.name.to_s].sort.join("_")
+                table = if name = association.options[:join_table]
+                          name.to_s
+                        else
+                          [table_name, association.name.to_s].sort.join("_")
+                        end
                 index = ""
-                unless connection.tables.include?(table)
-                  connection.create_table(table)
-                  connection.add_column table, "#{table.singularize}_id", :integer
-                  connection.add_column table, "#{association.name.to_s.singularize}_id", :integer
-                  connection.add_index table.to_sym, ["#{table.singularize}_id", "#{association.name.to_s.singularize}_id"].sort.map(&:to_sym), association.options
+                unless connection.tables.include?(table.to_s)
+                  foreign_key             = association.options[:foreign_key] || "#{table.singularize}_id"
+                  association_foreign_key = association.options[:association_foreign_key] || "#{association.name.to_s.singularize}_id"
+                  connection.create_table(table, :id => false) do |t|
+                    t.integer foreign_key
+                    t.integer association_foreign_key
+                  end
+                  connection.add_index table.to_sym, [foreign_key, association_foreign_key].map(&:to_sym), association.options
                 end
                 # Add join table to our schema tables
                 schema_tables << table unless schema_tables.include?(table)

data/lib/mini_record/version.rb

@@ -1,3 +1,3 @@
 module MiniRecord
-  VERSION = "0.3.0.a"
+  VERSION = "0.3.0.b"
 end

data/spec/mini_record_spec.rb

@@ -237,7 +237,7 @@ describe MiniRecord do
   it 'creates a join table with indexes for has_and_belongs_to_many relations' do
     tables = Tool.connection.tables
     tables.must_include('purposes_tools')
-    index = 'index_purposes_tools_on_purpose_id_and_purposes_tool_id'
+    index = 'index_purposes_tools_on_purposes_tool_id_and_purpose_id'
     Tool.connection.indexes('purposes_tools').map(&:name).must_include index
     # Ensure that join table is not deleted on subsequent upgrade
     Tool.auto_upgrade!
@@ -252,6 +252,19 @@ describe MiniRecord do
     Tool.connection.tables.wont_include('purposes_tools')
   end
 
+  it 'has_and_belongs_to_many with custom join_table and foreign keys' do
+    class Foo < ActiveRecord::Base
+      has_and_belongs_to_many :watchers, :join_table => :watchers, :foreign_key => :custom_foo_id, :association_foreign_key => :customer_id
+    end
+    Foo.auto_upgrade!
+    conn = ActiveRecord::Base.connection
+    conn.tables.must_include 'watchers'
+    cols = conn.columns('watchers').map(&:name)
+    cols.wont_include 'id'
+    cols.must_include 'custom_foo_id'
+    cols.must_include 'customer_id'
+  end
+
   it 'should support #belongs_to with :class_name' do
     Task.schema_columns.must_include 'author_id'
     Task.db_columns.must_include 'author_id'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mini_record
 version: !ruby/object:Gem::Version 
-  hash: 50
+  hash: 51
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
-  - a
-  version: 0.3.0.a
+  - b
+  version: 0.3.0.b
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-21 00:00:00 Z
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord