activerecord-oracle_enhanced-adapter 1.3.0 → 1.3.1

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -151,7 +151,8 @@ describe "OracleEnhancedAdapter schema dump" do
     
     after(:each) do
       schema_define do
-        remove_foreign_key :test_comments, :test_posts
+        remove_foreign_key :test_comments, :test_posts rescue nil
+        remove_foreign_key :test_comments, :name => 'comments_posts_baz_fooz_fk' rescue nil
       end
     end
     after(:all) do
@@ -210,6 +211,23 @@ describe "OracleEnhancedAdapter schema dump" do
       standard_dump(:ignore_tables => [ /test_posts/i ]).should =~ /add_foreign_key "test_comments"/
     end
 
+    it "should include composite foreign keys" do
+      schema_define do
+        add_column :test_posts, :baz_id, :integer
+        add_column :test_posts, :fooz_id, :integer
+      
+        execute <<-SQL
+          ALTER TABLE TEST_POSTS 
+          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
+        SQL
+      
+        add_column :test_comments, :baz_id, :integer
+        add_column :test_comments, :fooz_id, :integer
+      
+        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
+      end
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", :columns => \["baz_id", "fooz_id"\], :name => "comments_posts_baz_fooz_fk"/
+    end
   end
 
   describe "synonyms" do

data/spec/active_record/connection_adapters/{oracle_enhanced_schema_spec.rb → oracle_enhanced_schema_statements_spec.rb}

@@ -489,6 +489,49 @@ describe "OracleEnhancedAdapter schema definition" do
       TestPost.delete(p.id)
       TestComment.find_by_id(c.id).test_post_id.should be_nil
     end
+    
+    it "should add a composite foreign key" do
+      schema_define do
+        add_column :test_posts, :baz_id, :integer
+        add_column :test_posts, :fooz_id, :integer
+        
+        execute <<-SQL
+          ALTER TABLE TEST_POSTS 
+          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
+        SQL
+        
+        add_column :test_comments, :baz_id, :integer
+        add_column :test_comments, :fooz_id, :integer
+        
+        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"]
+      end
+      
+      lambda do
+        TestComment.create(:body => "test", :fooz_id => 1, :baz_id => 1)
+      end.should raise_error() {|e| e.message.should =~ 
+        /ORA-02291.*\.TES_COM_BAZ_ID_FOO_ID_FK/}
+    end
+
+    it "should add a composite foreign key with name" do
+      schema_define do
+        add_column :test_posts, :baz_id, :integer
+        add_column :test_posts, :fooz_id, :integer
+        
+        execute <<-SQL
+          ALTER TABLE TEST_POSTS 
+          ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
+        SQL
+        
+        add_column :test_comments, :baz_id, :integer
+        add_column :test_comments, :fooz_id, :integer
+        
+        add_foreign_key :test_comments, :test_posts, :columns => ["baz_id", "fooz_id"], :name => 'comments_posts_baz_fooz_fk'
+      end
+      
+      lambda do
+        TestComment.create(:body => "test", :baz_id => 1, :fooz_id => 1)
+      end.should raise_error() {|e| e.message.should =~ /ORA-02291.*\.COMMENTS_POSTS_BAZ_FOOZ_FK/}
+    end
 
     it "should remove foreign key by table name" do
       schema_define do
@@ -786,7 +829,7 @@ describe "OracleEnhancedAdapter schema definition" do
       @conn.instance_variable_set :@would_execute_sql, @would_execute_sql=''
       class <<@conn
         def execute(sql,name=nil); @would_execute_sql << sql << ";\n"; end
-        def index_exists?(table_name, index_name, default); default; end
+        def index_name_exists?(table_name, index_name, default); default; end
       end
     end
 

data/spec/active_record/connection_adapters/{oracle_enhanced_adapter_structure_dumper_spec.rb → oracle_enhanced_structure_dump_spec.rb}

@@ -29,6 +29,12 @@ describe "OracleEnhancedAdapter structure dump" do
       @conn.execute "DROP TRIGGER test_post_trigger" rescue nil
       @conn.execute "DROP TYPE TEST_TYPE" rescue nil
       @conn.execute "DROP TABLE bars" rescue nil
+      @conn.execute "ALTER TABLE foos drop CONSTRAINT UK_BAZ" rescue nil
+      @conn.execute "ALTER TABLE foos drop CONSTRAINT UK_FOOZ_BAZ" rescue nil
+      @conn.execute "ALTER TABLE foos drop column fooz_id" rescue nil
+      @conn.execute "ALTER TABLE foos drop column baz_id" rescue nil
+      @conn.execute "ALTER TABLE test_posts drop column fooz_id" rescue nil
+      @conn.execute "ALTER TABLE test_posts drop column baz_id" rescue nil
     end
   
     it "should dump single primary key" do
@@ -60,6 +66,48 @@ describe "OracleEnhancedAdapter structure dump" do
       dump.split('\n').length.should == 1
       dump.should =~ /ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOO\"? FOREIGN KEY \(\"?FOO_ID\"?\) REFERENCES \"?FOOS\"?\(\"?ID\"?\)/i
     end
+    
+    it "should dump foreign keys when reference column name is not 'id'" do
+      @conn.add_column :foos, :baz_id, :integer
+      
+      @conn.execute <<-SQL
+        ALTER TABLE FOOS 
+        ADD CONSTRAINT UK_BAZ UNIQUE (BAZ_ID)
+      SQL
+      
+      @conn.add_column :test_posts, :baz_id, :integer
+      
+      @conn.execute <<-SQL
+        ALTER TABLE TEST_POSTS 
+        ADD CONSTRAINT fk_test_post_baz FOREIGN KEY (baz_id) REFERENCES foos(baz_id)
+      SQL
+      
+      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump.split('\n').length.should == 1
+      dump.should =~ /ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\)/i
+    end
+    
+    it "should dump composite foreign keys" do
+      @conn.add_column :foos, :fooz_id, :integer
+      @conn.add_column :foos, :baz_id, :integer
+      
+      @conn.execute <<-SQL
+        ALTER TABLE FOOS 
+        ADD CONSTRAINT UK_FOOZ_BAZ UNIQUE (BAZ_ID,FOOZ_ID)
+      SQL
+      
+      @conn.add_column :test_posts, :fooz_id, :integer
+      @conn.add_column :test_posts, :baz_id, :integer
+            
+      @conn.execute <<-SQL
+        ALTER TABLE TEST_POSTS
+        ADD CONSTRAINT fk_test_post_fooz_baz FOREIGN KEY (baz_id,fooz_id) REFERENCES foos(baz_id,fooz_id)
+      SQL
+      
+      dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
+      dump.split('\n').length.should == 1
+      dump.should =~ /ALTER TABLE \"?TEST_POSTS\"? ADD CONSTRAINT \"?FK_TEST_POST_FOOZ_BAZ\"? FOREIGN KEY \(\"?BAZ_ID\"?\,\"?FOOZ_ID\"?\) REFERENCES \"?FOOS\"?\(\"?BAZ_ID\"?\,\"?FOOZ_ID\"?\)/i
+    end
   
     it "should not error when no foreign keys are present" do
       dump = ActiveRecord::Base.connection.structure_dump_fk_constraints
@@ -108,7 +156,7 @@ describe "OracleEnhancedAdapter structure dump" do
           add CONSTRAINT uk_foo_foo_id UNIQUE (foo, foo_id)
       SQL
       dump = ActiveRecord::Base.connection.structure_dump_unique_keys("test_posts")
-      dump.should == [" CONSTRAINT UK_FOO_FOO_ID UNIQUE (FOO,FOO_ID)"]
+      dump.should == ["ALTER TABLE TEST_POSTS ADD CONSTRAINT UK_FOO_FOO_ID UNIQUE (FOO,FOO_ID)"]
     
       dump = ActiveRecord::Base.connection.structure_dump
       dump.should =~ /CONSTRAINT UK_FOO_FOO_ID UNIQUE \(FOO,FOO_ID\)/

data/spec/spec_helper.rb

@@ -1,55 +1,47 @@
 require 'rubygems'
-gem 'rspec'
-require 'spec'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-if ENV['RAILS_GEM_VERSION'] =~ /^2.0/
-  gem 'activerecord', '=2.0.2'
-  gem 'actionpack', '=2.0.2'
-  gem 'activesupport', '=2.0.2'
-  gem 'composite_primary_keys', '=0.9.93'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.1/
-  gem 'activerecord', '=2.1.2'
-  gem 'actionpack', '=2.1.2'
-  gem 'activesupport', '=2.1.2'
-  gem 'composite_primary_keys', '=1.0.8'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.2/
-  gem 'activerecord', '=2.2.2'
-  gem 'actionpack', '=2.2.2'
-  gem 'activesupport', '=2.2.2'
-  gem 'composite_primary_keys', '=2.2.2'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.3/
-  gem 'activerecord', '=2.3.3'
-  gem 'actionpack', '=2.3.3'
-  gem 'activesupport', '=2.3.3'
-  gem 'composite_primary_keys', '=2.3.2'
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3.5/
-  gem 'activerecord', '=2.3.5'
-  gem 'actionpack', '=2.3.5'
-  gem 'activesupport', '=2.3.5'
-  NO_COMPOSITE_PRIMARY_KEYS = true
-elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
-  gem 'activerecord', '=2.3.8'
-  gem 'actionpack', '=2.3.8'
-  gem 'activesupport', '=2.3.8'
-  NO_COMPOSITE_PRIMARY_KEYS = true
-else
-  # uses local copy of Rails 3 gems
-  ['rails/activerecord', 'rails/activemodel', 'rails/activesupport', 'arel', 'rails/actionpack', 'rails/railties'].each do |library|
-    $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../' + library + '/lib'))
-  end
-  ENV['RAILS_GEM_VERSION'] ||= '3.0'
-  NO_COMPOSITE_PRIMARY_KEYS = true
+require 'spec'
+
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
+  puts "==> Running specs with MRI version #{RUBY_VERSION}"
+  require 'oci8'
+elsif RUBY_ENGINE == 'jruby'
+  puts "==> Running specs with JRuby version #{JRUBY_VERSION}"
 end
 
+ENV['RAILS_GEM_VERSION'] ||= '3.0.0'
+NO_COMPOSITE_PRIMARY_KEYS = true if ENV['RAILS_GEM_VERSION'] >= '2.3.5'
+
+puts "==> Running specs with Rails version #{ENV['RAILS_GEM_VERSION']}"
+
 require 'active_record'
 
 if ENV['RAILS_GEM_VERSION'] >= '3.0'
   require 'action_dispatch'
   require 'active_support/core_ext/module/attribute_accessors'
-  require "rails/log_subscriber"
-  require 'active_record/railties/log_subscriber'
+
+  if ENV['RAILS_GEM_VERSION'] =~ /^3.0.0.beta/
+    require "rails/log_subscriber"
+    require 'active_record/railties/log_subscriber'
+  else
+    require "active_support/log_subscriber"
+    require 'active_record/log_subscriber'
+  end
+
   require 'logger'
 elsif ENV['RAILS_GEM_VERSION'] =~ /^2.3/
   require 'action_pack'
@@ -59,13 +51,6 @@ elsif ENV['RAILS_GEM_VERSION'] <= '2.3'
   require 'action_pack'
   require 'action_controller/session/active_record_store'
 end
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '>=2.0.4'
-  require 'oci8'
-elsif RUBY_ENGINE == 'jruby'
-  gem 'activerecord-jdbc-adapter'
-  require 'active_record/connection_adapters/jdbc_adapter'
-end
 
 require 'active_record/connection_adapters/oracle_enhanced_adapter'
 require 'ruby-plsql'
@@ -73,18 +58,31 @@ require 'ruby-plsql'
 module LoggerSpecHelper
   def set_logger
     @logger = MockLogger.new
+    @old_logger = ActiveRecord::Base.logger
 
-    if ENV['RAILS_GEM_VERSION'] >= '3.0'
+    if ENV['RAILS_GEM_VERSION'] =~ /^3.0.0.beta/
       queue = ActiveSupport::Notifications::Fanout.new
       @notifier = ActiveSupport::Notifications::Notifier.new(queue)
 
       Rails::LogSubscriber.colorize_logging = false
 
       ActiveRecord::Base.logger = @logger
+      @old_notifier = ActiveSupport::Notifications.notifier
       ActiveSupport::Notifications.notifier = @notifier
 
       Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
 
+    elsif ENV['RAILS_GEM_VERSION'] >= '3.0'
+      @notifier = ActiveSupport::Notifications::Fanout.new
+
+      ActiveSupport::LogSubscriber.colorize_logging = false
+
+      ActiveRecord::Base.logger = @logger
+      @old_notifier = ActiveSupport::Notifications.notifier
+      ActiveSupport::Notifications.notifier = @notifier
+
+      ActiveRecord::LogSubscriber.attach_to(:active_record)
+
     else # ActiveRecord 2.x
       if ActiveRecord::Base.respond_to?(:connection_pool)
         ActiveRecord::Base.connection_pool.clear_reloadable_connections!
@@ -133,8 +131,14 @@ module LoggerSpecHelper
   end
 
   def clear_logger
-    ActiveRecord::Base.logger = @logger = nil
-    ActiveSupport::Notifications.notifier = @notifier = nil if @notifier
+    ActiveRecord::Base.logger = @old_logger
+    @logger = nil
+
+    if ENV['RAILS_GEM_VERSION'] >= '3.0'
+      ActiveSupport::Notifications.notifier = @old_notifier
+      @notifier = nil
+    end
+
   end
 
   # Wait notifications to be published (for Rails 3.0)
@@ -156,8 +160,8 @@ module SchemaSpecHelper
 end
 
 DATABASE_NAME = ENV['DATABASE_NAME'] || 'orcl'
-DATABASE_HOST = ENV['DATABASE_HOST'] || 'localhost'
-DATABASE_PORT = ENV['DATABASE_PORT'] || 1521
+DATABASE_HOST = ENV['DATABASE_HOST']
+DATABASE_PORT = ENV['DATABASE_PORT']
 DATABASE_USER = ENV['DATABASE_USER'] || 'oracle_enhanced'
 DATABASE_PASSWORD = ENV['DATABASE_PASSWORD'] || 'oracle_enhanced'
 DATABASE_SYS_PASSWORD = ENV['DATABASE_SYS_PASSWORD'] || 'admin'
@@ -166,6 +170,7 @@ CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,
   :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
   :username => DATABASE_USER,
   :password => DATABASE_PASSWORD
 }
@@ -174,6 +179,7 @@ SYS_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,
   :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
   :username => "sys",
   :password => DATABASE_SYS_PASSWORD,
   :privilege => "SYSDBA"
@@ -183,6 +189,7 @@ SYSTEM_CONNECTION_PARAMS = {
   :adapter => "oracle_enhanced",
   :database => DATABASE_NAME,
   :host => DATABASE_HOST,
+  :port => DATABASE_PORT,
   :username => "system",
   :password => DATABASE_SYS_PASSWORD
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 +03:00
+date: 2010-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - History.txt
 - License.txt
 - README.rdoc
+- RUNNING_TESTS.rdoc
 - Rakefile
 - VERSION
 - activerecord-oracle_enhanced-adapter.gemspec
@@ -57,6 +59,8 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced.rake
 - lib/active_record/connection_adapters/oracle_enhanced_activerecord_patches.rb
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+- lib/active_record/connection_adapters/oracle_enhanced_base_ext.rb
+- lib/active_record/connection_adapters/oracle_enhanced_column.rb
 - lib/active_record/connection_adapters/oracle_enhanced_connection.rb
 - lib/active_record/connection_adapters/oracle_enhanced_context_index.rb
 - lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb
@@ -67,11 +71,13 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced_procedures.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb
+- lib/active_record/connection_adapters/oracle_enhanced_schema_statements.rb
 - lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
+- lib/active_record/connection_adapters/oracle_enhanced_structure_dump.rb
 - lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced_version.rb
+- lib/activerecord-oracle_enhanced-adapter.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
@@ -82,7 +88,8 @@ files:
 - spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -121,7 +128,6 @@ specification_version: 3
 summary: Oracle enhanced adapter for ActiveRecord
 test_files: 
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_context_index_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb
@@ -132,5 +138,6 @@ test_files:
 - spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_structure_dump_spec.rb
 - spec/spec_helper.rb