aspgems-redhillonrails_core 2.0.0.beta2 → 2.0.0.beta4

data/spec/connections/postgresql/connection.rb

@@ -4,12 +4,13 @@ require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 ActiveRecord::Base.configurations = {
-  'redhillonrails' => {
+  'postgres' => {
     :adapter => 'postgresql',
-    :database => 'redhillonrails_core_test',
+    :database => 'redhillonrails_core',
+    :username => 'postgres',
     :min_messages => 'warning'
   }
 
 }
 
-ActiveRecord::Base.establish_connection 'redhillonrails'
+ActiveRecord::Base.establish_connection 'postgres'

data/spec/connections/sqlite3/connection.rb

@@ -4,11 +4,12 @@ require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 ActiveRecord::Base.configurations = {
-  'redhillonrails' => {
+  'sqlite3' => {
     :adapter => 'sqlite3',
-    :database => File.expand_path(File.dirname(__FILE__) + 'redhillonrails_core.db')
+    :database => ':memory:',
+    :timeout => 500
   }
 
 }
 
-ActiveRecord::Base.establish_connection 'redhillonrails'
+ActiveRecord::Base.establish_connection 'sqlite3'

data/spec/foreign_key_definition_spec.rb

@@ -4,12 +4,36 @@ require 'models/user'
 
 describe "Foreign Key definition" do
 
-  let(:definition) { RedhillonrailsCore::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new("posts_user_fkey", :posts, :user, :users, :id) }
+  let(:fk_definition) { RedhillonrailsCore::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition }
 
   it "it is dumped to sql with quoted values" do
-    definition.to_sql.should == %Q{CONSTRAINT posts_user_fkey FOREIGN KEY (#{quote_column_name('user')}) REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})}
+    definition = fk_definition.new("named_fkey", :posts, :user, :users, :id)
+    definition.to_sql.should == foreign_key_sql("named_fkey")
   end
 
+  context "when name isn't given" do
+
+    it "builds name from table and column name" do
+      definition = fk_definition.new(nil, :posts, :user, :users, :id)
+      definition.to_sql.should == foreign_key_sql("posts_user_fkey")
+    end
+
+    it "build name with column joined with underscore for compsite key" do
+      definition = fk_definition.new(nil, :orders, [:inquiry_id, :user_id], :inquiries, [:id, :user_id])
+      expected_definition = "CONSTRAINT orders_inquiry_id_user_id_fkey FOREIGN KEY \
+        (#{quote_column_name("inquiry_id")}, #{quote_column_name("user_id")}) \
+        REFERENCES #{quote_table_name("inquiries")} (#{quote_column_name("id")}, #{quote_column_name("user_id")})".squeeze(" ")
+      definition.to_sql.should == expected_definition
+    end
+
+  end
+
+  it "does not include name if no name or table_name is given" do
+    definition = fk_definition.new(nil, nil, :user, :users, :id)
+    definition.to_sql.should == foreign_key_sql(nil)
+  end
+
+  protected
   def quote_table_name(table)
     ActiveRecord::Base.connection.quote_table_name(table)
   end
@@ -18,4 +42,9 @@ describe "Foreign Key definition" do
     ActiveRecord::Base.connection.quote_column_name(column)
   end
 
+  def foreign_key_sql(fk_name)
+    [("CONSTRAINT #{fk_name}" if fk_name), "FOREIGN KEY (#{quote_column_name('user')}) "\
+        "REFERENCES #{quote_table_name('users')} (#{quote_column_name('id')})"].compact.join(' ')
+  end
+
 end

data/spec/foreign_key_spec.rb

@@ -10,7 +10,7 @@ describe "Foreign Key" do
 
   context "when is added", "posts(author_id)" do
 
-    before(:each) do 
+    before(:each) do
       add_foreign_key(:posts, :author_id, :users, :id, :on_update => :cascade, :on_delete => :restrict)
     end
 
@@ -60,7 +60,7 @@ describe "Foreign Key" do
     it "is no longer available in Post.foreign_keys" do
       Comment.foreign_keys.collect(&:column_names).should_not include(%w[post_id])
     end
-    
+
     it "is no longer available in User.reverse_foreign_keys" do
       Post.reverse_foreign_keys.collect(&:column_names).should_not include(%w[post_id])
     end
@@ -78,6 +78,19 @@ describe "Foreign Key" do
 
   end
 
+  it "shouldn't raise when restrited keyword in table name is used" do
+    migration.suppress_messages do
+      migration.create_table :select, :force => true do |t|
+        t.integer :post_id
+      end
+    end
+    expect do
+      add_foreign_key(:select, :post_id, :posts, :id, :name => "test_fk")
+      remove_foreign_key(:select,  "test_fk")
+    end.should_not raise_error(Exception)
+    migration.suppress_messages { migration.drop_table :select }
+  end
+
   protected
   def add_foreign_key(*args)
     migration.suppress_messages do

data/spec/migration_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Migration" do
+
+  let(:migration) { ActiveRecord::Migration }
+
+  it "should allow to remove more then one column at once" do
+    migration.suppress_messages do
+      migration.create_table :likes, :id => false, :force => true do |t|
+        t.string :remarks
+        t.integer :post_id
+        t.datetime :created_at
+      end
+      migration.remove_columns :likes, :post_id, :created_at
+      migration.connection.columns(:likes).should have(1).column
+      migration.drop_table :likes
+    end
+  end
+
+  it "should raise an exception if try to remove no column" do
+    migration.suppress_messages do
+      migration.create_table :likes, :id => false, :force => true do |t|
+        t.string :remarks
+        t.integer :post_id
+        t.datetime :created_at
+      end
+      expect {
+        migration.remove_columns :likes
+      }.to raise_error(ArgumentError)
+      migration.drop_table :likes
+    end
+  end
+
+end

data/spec/table_definition_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'models/post'
+
+describe "Table definition" do
+
+  let(:connection) { ::ActiveRecord::Migration.connection }
+
+  unless ::ActiveRecord::Base.connection.class.include?(
+      RedhillonrailsCore::ActiveRecord::ConnectionAdapters::Sqlite3Adapter)
+
+    it "sets table_name of foreign key definition when running migrations" do
+      connection.create_table :votes, :force => true do |t|
+        t.integer :kind
+        t.integer :application_id
+        t.integer :user_id
+        t.foreign_key :user_id, :users, :id
+      end
+
+      Vote = Class.new(ActiveRecord::Base)
+      Vote.foreign_keys.size.should == 1
+      Vote.foreign_keys[0].table_name.should == 'votes'
+      connection.drop_table :votes
+    end
+
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: aspgems-redhillonrails_core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta2
+  version: 2.0.0.beta4
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -11,11 +11,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 Z
+date: 2011-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,21 +33,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: pg
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mysql
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,10 +66,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mysql2
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +77,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,6 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.1
   type: :development
+  prerelease: false
   version_requirements: *id007
 description: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff. Easily create foreign_keys, complex indexes and views.
 email: 
@@ -101,11 +101,23 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.md
+- README_DEV.md
 - Rakefile
+- Thorfile
+- gemfiles/rails-3.0.7
+- gemfiles/rails-3.0.7.lock
+- gemfiles/rails-3.0.8
+- gemfiles/rails-3.0.8.lock
+- gemfiles/rails-3.0.9
+- gemfiles/rails-3.0.9.lock
+- gemfiles/rails-3.1.0.rc5
+- gemfiles/rails-3.1.0.rc5.lock
 - init.rb
 - lib/redhillonrails_core.rb
 - lib/redhillonrails_core/active_record/base.rb
@@ -119,11 +131,13 @@ files:
 - lib/redhillonrails_core/active_record/connection_adapters/mysql_column.rb
 - lib/redhillonrails_core/active_record/connection_adapters/postgresql_adapter.rb
 - lib/redhillonrails_core/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/redhillonrails_core/active_record/migration/command_recorder.rb
 - lib/redhillonrails_core/active_record/schema.rb
 - lib/redhillonrails_core/active_record/schema_dumper.rb
 - lib/redhillonrails_core/version.rb
 - lib/tasks/db/comments.rake
 - redhillonrails_core.gemspec
+- spec/command_recorder_spec.rb
 - spec/connections/mysql/connection.rb
 - spec/connections/mysql2/connection.rb
 - spec/connections/postgresql/connection.rb
@@ -132,6 +146,7 @@ files:
 - spec/foreign_key_spec.rb
 - spec/index_definition_spec.rb
 - spec/index_spec.rb
+- spec/migration_spec.rb
 - spec/models/comment.rb
 - spec/models/post.rb
 - spec/models/user.rb
@@ -139,6 +154,7 @@ files:
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.rb
 - spec/support/reference.rb
+- spec/table_definition_spec.rb
 homepage: https://github.com/aspgems/redhillonrails_core
 licenses: []
 
@@ -152,6 +168,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 437283791
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -162,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff