mini_record 0.3.1 → 0.3.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e4dc06c60db297bde1fa28fc64dc5e05c33a7d8
+  data.tar.gz: cd4c70eb0948b45cc0320e9909f5db4285815a74
+SHA512:
+  metadata.gz: 0b892d72b036a1d9be13cb12a49da31bc6242e15039260f9a449c8bb11ba961a9b4e88dfadff1fd294a8c741b3502b82aa591f10ed158d50ad719516c30b61cb
+  data.tar.gz: 0f7d088dc27778e79096f6a3ccc8ae6a43d9c97ae09bc34463df241da8a8e7a648fb7d50d7a0ba6963015895ace7ec790a1e183ea71acc4ec93af9c71ba6d199

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx-18mode
-  - ruby-head
+  - rbx
   - ree
 notifications:
   recipients:
-    - d.dagostino@lipsiasoft.com
+    - info@daddye.it

data/Gemfile

@@ -8,4 +8,8 @@ gem 'mysql2'
 gem 'mysql'
 gem 'pg'
 
+group :test do
+  gem 'foreigner', '>= 1.4.2'
+end
+
 gemspec

data/README.md

@@ -51,7 +51,7 @@ Instead of `:as => :my_type` you can use `:type => :my_type`
 Option `:as` or `:type` if not provided is `:string` by default, you can use all ActiveRecord types:
 
 ``` rb
-:primary_key, :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, 
+:primary_key, :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time,
 :date, :binary, :boolean, :references, :belongs_to, :timestamp
 ```
 
@@ -89,6 +89,15 @@ end
 ```
 Will result in a person_id column (you can override with the `foreign_key` option) which is indexed
 
+#### belongs_to with foreign key in database
+```ruby
+class Address < ActiveRecord::Base
+  belongs_to :person
+  index :person_id, :foreign => true
+end
+```
+The same as in the previous case, but foreign key will be added to the database with help of [foreigner](https://github.com/matthuhiggins/foreigner) gem.
+
 #### belongs_to (polymorphic)
 ```ruby
 class Address < ActiveRecord::Base

data/Rakefile

@@ -1,6 +1,7 @@
-require "bundler/gem_tasks"
-require "rake"
-require "rake/testtask"
+require 'rubygems'
+require 'bundler/gem_tasks'
+require 'rake'
+require 'rake/testtask'
 
 %w(install release).each do |task|
   Rake::Task[task].enhance do

data/lib/mini_record/auto_schema.rb

@@ -85,7 +85,7 @@ module MiniRecord
       alias :col       :field
 
       def timestamps
-        field :created_at, :updated_at, :as => :datetime
+        field :created_at, :updated_at, :as => :datetime, :null => false
       end
 
       def reset_table_definition!
@@ -120,6 +120,35 @@ module MiniRecord
         end
       end
 
+      # Remove foreign keys for indexes without :foreign=>true option
+      def remove_foreign_keys
+        # fk cache to minimize quantity of sql queries
+        @foreign_keys = connection.foreign_keys(table_name)
+        indexes.each do |name, options|
+          unless options[:foreign]
+            foreign_key = @foreign_keys.detect { |fk| fk.options[:column] == options[:column].to_s }
+            if foreign_key
+              connection.remove_foreign_key(table_name, :name => foreign_key.options[:name])
+              @foreign_keys.delete(foreign_key)
+            end
+          end
+        end
+      end
+
+      # Add foreign keys for indexes with :foreign=>true option, if the key doesn't exists
+      def add_foreign_keys
+        indexes.each do |name, options|
+          if options[:foreign]
+            column = options[:column].to_s
+            unless @foreign_keys.detect { |fk| fk[:options][:column] == column }
+              to_table = (reflect_on_all_associations.detect { |a| a.foreign_key==column }).table_name
+              connection.add_foreign_key(table_name, to_table, options)
+              @foreign_keys << { :options=> { :column=>column } }
+            end
+          end
+        end
+      end
+
       def auto_upgrade!
         return unless connection?
 
@@ -237,6 +266,8 @@ module MiniRecord
             end
           end
 
+          remove_foreign_keys if connection.respond_to?(:foreign_keys)
+
           # Remove old index
           (indexes_in_db.keys - indexes.keys).each do |name|
             connection.remove_index(table_name, :name => name)
@@ -250,6 +281,8 @@ module MiniRecord
             end
           end
 
+          add_foreign_keys if connection.respond_to?(:foreign_keys)
+
           # Reload column information
           reset_column_information
         end

data/lib/mini_record/version.rb

@@ -1,3 +1,3 @@
 module MiniRecord
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

data/test/helper.rb

@@ -49,6 +49,10 @@ end # ActiveRecord::Base
 case ENV['DB']
 when 'mysql'
   ActiveRecord::Base.establish_connection(:adapter => 'mysql', :database => 'test', :user => 'root')
+when 'mysql2'
+  ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'test', :user => 'root')
+  Bundler.require(:test)  # require 'foreigner'
+  Foreigner.load
 when 'pg', 'postgresql'
   ActiveRecord::Base.establish_connection(:adapter => 'postgresql', :database => 'test', :user => 'postgres', :host => 'localhost')
 else

data/test/test_mini_record.rb

@@ -3,8 +3,11 @@ require File.expand_path('../helper.rb', __FILE__)
 describe MiniRecord do
 
   before do
+    ActiveRecord::Base.clear_reloadable_connections!
+    ActiveRecord::Base.clear_cache!
+    ActiveRecord::Base.clear_active_connections!
     conn.tables.each { |table| silence_stream(STDERR) { conn.execute "DROP TABLE IF EXISTS #{table}" } }
-    ActiveRecord::Base.descendants.each { |klass| Object.send(:remove_const, klass.to_s) }
+    ActiveRecord::Base.descendants.each { |klass| Object.send(:remove_const, klass.to_s) if Object.const_defined?(klass.to_s) }
     ActiveSupport::DescendantsTracker.direct_descendants(ActiveRecord::Base).clear
     load File.expand_path('../models.rb', __FILE__)
     ActiveRecord::Base.auto_upgrade!
@@ -40,7 +43,7 @@ describe MiniRecord do
     assert_equal 'foo', person.name
     assert_nil person.surname
 
-    person.update_attribute(:surname, 'bar')
+    person.update_column(:surname, 'bar')
     assert_equal %w[created_at id name surname updated_at], Person.db_columns.sort
 
     # Remove a column without lost data
@@ -217,7 +220,7 @@ describe MiniRecord do
     foo = Foo.create(:name => 'test')
     assert_empty Foo.first.name
 
-    foo.update_attribute(:name, 'foo')
+    foo.update_column(:name, 'foo')
 
     assert_equal 'foo', Foo.first.name
   end
@@ -319,7 +322,7 @@ describe MiniRecord do
       article.reload
       assert_nil article.body
 
-      article.update_attribute(:body, 'null')
+      article.update_column(:body, 'null')
       assert_equal 'null', article.body
 
       # Finally check the index existance
@@ -335,6 +338,78 @@ describe MiniRecord do
       assert_equal 4, Foo.db_fields[:user_id].limit
       assert_equal false, Foo.db_fields[:user_id].null
     end
+
+    it 'add/remove foreign key with :foreign option, when Foreigner gem used on mysql' do
+      skip unless conn.adapter_name =~ /mysql/i
+
+      class Book < ActiveRecord::Base
+        belongs_to :publisher
+        index :publisher_id, :foreign => true
+      end
+      Book.auto_upgrade!
+
+      assert_includes Book.db_columns, 'publisher_id'
+      assert_includes Book.db_indexes, 'index_books_on_publisher_id'
+
+      assert connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'publisher_id'}
+
+      Object.send(:remove_const, :Book)
+      class Book < ActiveRecord::Base
+        belongs_to :publisher
+      end
+      Book.auto_upgrade!
+
+      assert_nil connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'publisher_id'}
+    end
+
+    it 'add/remove named foreign key with :foreign option, when Foreigner gem used on mysql' do
+      skip unless conn.adapter_name =~ /mysql/i
+
+      class Book < ActiveRecord::Base
+        belongs_to :publisher
+        index :publisher_id, :name => 'my_super_publisher_id_fk', :foreign => true
+      end
+      Book.auto_upgrade!
+
+      assert_includes Book.db_columns, 'publisher_id'
+      assert_includes Book.db_indexes, 'my_super_publisher_id_fk'
+
+      assert connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'publisher_id'}
+
+      Object.send(:remove_const, :Book)
+      class Book < ActiveRecord::Base
+        belongs_to :publisher
+        index :publisher_id, :name => 'my_super_publisher_id_fk'
+      end
+      Book.auto_upgrade!
+
+      assert_nil connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'publisher_id'}
+      Object.send(:remove_const, :Book)
+    end
+
+    it 'support :foreign option in the index with custom :foreign_key in the belong_to association' do
+      skip unless conn.adapter_name =~ /mysql/i
+
+      class Book < ActiveRecord::Base
+        belongs_to :second_publisher, :foreign_key => 'second_publisher_id', :class_name => 'Publisher'
+        index :second_publisher_id, :foreign => true
+      end
+      Book.auto_upgrade!
+
+      assert_includes Book.db_columns, 'second_publisher_id'
+      assert_includes Book.db_indexes, 'index_books_on_second_publisher_id'
+
+      assert connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'second_publisher_id'}
+
+      Object.send(:remove_const, :Book)
+      class Book < ActiveRecord::Base
+        belongs_to :second_publisher, :foreign_key => 'second_publisher_id', :class_name => 'Publisher'
+      end
+      Book.auto_upgrade!
+
+      assert_nil connection.foreign_keys(:books).detect {|fk| fk.options[:column] == 'second_publisher_id'}
+    end
+
   end
 
   describe 'relation #habtm' do
@@ -500,4 +575,5 @@ describe MiniRecord do
     assert_equal 2, Foo.db_fields[:currency].scale
     assert_equal 4, Foo.db_fields[:currency].limit
   end
+
 end

metadata

@@ -1,51 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mini_record
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.4
 platform: ruby
-authors: 
+authors:
 - Davide D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-description: "\n\
-  With it you can add the ability to create columns outside the default schema, directly\n\
-  in your model in a similar way that you just know in others projects\n\
-  like  DataMapper or  MongoMapper.\n  "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+description: "\nWith it you can add the ability to create columns outside the default
+  schema, directly\nin your model in a similar way that you just know in others projects\nlike
+  \ DataMapper or  MongoMapper.\n  "
+email:
 - d.dagostino@lipsiasoft.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -60,38 +47,29 @@ files:
 - test/test_mini_record.rb
 homepage: https://github.com/DAddYE/mini_record
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mini_record
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: MiniRecord is a micro gem that allow you to write schema inside your model as you can do in DataMapper.
-test_files: 
+specification_version: 4
+summary: MiniRecord is a micro gem that allow you to write schema inside your model
+  as you can do in DataMapper.
+test_files:
 - test/helper.rb
 - test/models.rb
 - test/test_mini_record.rb