activerecord-oracle_enhanced-adapter 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd6a6db570f470b83b8fe4621508cce81d6d749e
-  data.tar.gz: ed27740e8ca3f41d06865bc6f59f0d83ec2917fb
+  metadata.gz: de6010dec5446b296a5ad3d372f6aaad1ac71549
+  data.tar.gz: c82a83f8d18e75b367925eb029f786b567e1f6e4
 SHA512:
-  metadata.gz: f5adcb7139e0b61b0c293f05223359f4b2b90f2e181132a399a43779988c33d77bb68e91dc68d9fb21b40f22cb46fa8a1b812f6717c55a1608045752f268babb
-  data.tar.gz: d5c03d67d03bbc42daa0dcc07f2d05e564eab79304dc3739e931a19066f385c1b357c389a301b613793bcddd5d220933750b3d6a0f95acdeeab56f9048519ccb
+  metadata.gz: 8887e65c6d08ede8097bdeb8951227edd05c92c943074853fb6caf16009033af74407d24d03da3ca9184aa0b37633939fec5174f07aac38d85ef84abdbd620f6
+  data.tar.gz: 0f3843a406fbe8945785b85ee849debb10636e82161b7423da0643bb6c2c3ee8f92b2bf0e5e46b5ec577ebdeda0d9020c63b8fa1624f7a325b5d9c110f72372e

data/History.md

@@ -1,3 +1,13 @@
+## 1.5.4 / 2014-03-25
+
+* Enhancements
+ * Support Rails 4.1.0.rc2
+ * Allow Java 8 to run with jruby [#383]
+
+* Bug Fix
+  * Fix db:schema:dump when foreign key column name is not 'id' [#409]
+  * Fix schema dump works when non Oracle adapter used [#428]
+
 ## 1.5.3 / 2014-03-04
 
 * Enhancements

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/activerecord-oracle_enhanced-adapter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-oracle_enhanced-adapter}
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.license = 'MIT'
   s.authors = [%q{Raimonds Simanovskis}]
-  s.date = %q{2014-03-04}
+  s.date = %q{2014-03-25}
   s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
 This adapter is superset of original ActiveRecord Oracle adapter.
 }

data/lib/active_record/connection_adapters/oracle_enhanced_column_dumper.rb

@@ -8,16 +8,23 @@ module ActiveRecord #:nodoc:
           alias_method_chain :column_spec,            :oracle_enhanced
           alias_method_chain :prepare_column_options, :oracle_enhanced
           alias_method_chain :migration_keys,         :oracle_enhanced
+
+          def oracle_enhanced_adapter?
+          # return original method if not using 'OracleEnhanced'
+            if (rails_env = defined?(Rails.env) ? Rails.env : (defined?(RAILS_ENV) ? RAILS_ENV : nil)) &&
+                ActiveRecord::Base.configurations[rails_env] &&
+                ActiveRecord::Base.configurations[rails_env]['adapter'] != 'oracle_enhanced'
+              return false
+            else
+              return true
+            end
+          end
         end
       end
 
       def column_spec_with_oracle_enhanced(column, types)
         # return original method if not using 'OracleEnhanced'
-        if (rails_env = defined?(Rails.env) ? Rails.env : (defined?(RAILS_ENV) ? RAILS_ENV : nil)) &&
-              ActiveRecord::Base.configurations[rails_env] &&
-              ActiveRecord::Base.configurations[rails_env]['adapter'] != 'oracle_enhanced'
-          return column_spec_with_oracle_enhanced(column, types)
-        end
+        return column_spec_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
         
         spec = prepare_column_options(column, types)
         (spec.keys - [:name, :type]).each do |k|
@@ -28,6 +35,9 @@ module ActiveRecord #:nodoc:
       end
 
       def prepare_column_options_with_oracle_enhanced(column, types)
+        # return original method if not using 'OracleEnhanced'
+        return prepare_column_options_without_oracle_enhanced(column, types) unless oracle_enhanced_adapter?
+
         spec = {}
         spec[:name]      = column.name.inspect
         spec[:type]      = column.virtual? ? 'virtual' : column.type.to_s
@@ -43,9 +53,13 @@ module ActiveRecord #:nodoc:
 
       def migration_keys_with_oracle_enhanced
         # TODO `& column_specs.map(&:keys).flatten` should be exetuted here
+        # return original method if not using 'OracleEnhanced'
+        return migration_keys_without_oracle_enhanced unless oracle_enhanced_adapter?
+
         [:name, :limit, :precision, :scale, :default, :null, :as, :virtual_type]
       end
 
+
     end
   end
 end

data/lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb

@@ -9,7 +9,7 @@ begin
     %w(ojdbc5.jar)
   elsif java_version =~ /^1.6/
     %w(ojdbc6.jar)
-  elsif java_version =~ /^1.7/
+  elsif java_version >= '1.7'
     # Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
     # Oracle 12c client provides new ojdbc7.jar
     %w(ojdbc7.jar ojdbc6.jar)
@@ -26,6 +26,7 @@ begin
       # check any compatible JDBC driver in the priority order
       ojdbc_jars.any? do |ojdbc_jar|
         if File.exists?(file_path = File.join(dir, ojdbc_jar))
+          puts "WARNING: JDK #{java_version} is not officially supported by #{ojdbc_jar}" if java_version >= '1.8'
           require file_path
           true
         end
@@ -43,7 +44,7 @@ begin
 
 rescue LoadError, NameError
   # JDBC driver is unavailable.
-  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars.join(' or ') || "Oracle JDBC"} library."
+  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars ? ojdbc_jars.join(' or ') : "Oracle JDBC"} library."
 end
 
 

data/lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb

@@ -61,15 +61,15 @@ module ActiveRecord #:nodoc:
           add_foreign_key_statements = foreign_keys.map do |foreign_key|
             statement_parts = [ ('add_foreign_key ' + foreign_key.from_table.inspect) ]
             statement_parts << foreign_key.to_table.inspect
-            
+
             if foreign_key.options[:columns].size == 1
               column = foreign_key.options[:columns].first
               if column != "#{foreign_key.to_table.singularize}_id"
                 statement_parts << ('column: ' + column.inspect)
               end
-              
+
               if foreign_key.options[:references].first != 'id'
-                statement_parts << ('primary_key: ' + foreign_key.options[:primary_key].inspect)
+                statement_parts << ('primary_key: ' + foreign_key.options[:references].first.inspect)
               end
             else
               statement_parts << ('columns: ' + foreign_key.options[:columns].inspect)

data/spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb

@@ -251,6 +251,26 @@ describe "OracleEnhancedAdapter schema dump" do
       dump = standard_dump
       dump.rindex("create_table").should < dump.index("add_foreign_key")
     end
+ 
+    it "should include primary_key when reference column name is not 'id'" do
+      schema_define do
+        create_table :test_posts, force: true, :primary_key => 'baz_id' do |t|
+          t.string :title
+        end
+        create_table :test_comments, force: true do |t|
+          t.string :body, limit: 4000
+          t.integer :baz_id
+        end
+      end
+
+      @conn.execute <<-SQL
+        ALTER TABLE TEST_COMMENTS
+        ADD CONSTRAINT TEST_COMMENTS_BAZ_ID_FK FOREIGN KEY (baz_id) REFERENCES test_posts(baz_id)
+      SQL
+
+      standard_dump.should =~ /add_foreign_key "test_comments", "test_posts", column: "baz_id", primary_key: "baz_id", name: "test_comments_baz_id_fk"/
+    end
+    
   end
 
   describe "synonyms" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler