activerecord-oracle_enhanced-adapter 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,9 @@
+== 1.1.4 2008-07-14
+
+* Enhancements:
+  * Date/Time quoting changes to support composite_primary_keys
+  * Added additional methods that are used by composite_primary_keys
+
 == 1.1.3 2008-07-10
 
 * Enhancements:

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -241,14 +241,17 @@ begin
               %Q{empty_#{ column.sql_type.downcase rescue 'blob' }()}
             # RSI: TIMESTAMP support
             when :timestamp
-              # add up to 9 digits of fractional seconds to inserted time
-              "TO_TIMESTAMP('#{value.to_s(:db)}.#{("%.9f"%value.to_f).split('.')[1]}','YYYY-MM-DD HH24:MI:SS:FF9')"
+              quote_timestamp_with_to_timestamp(value)
             # RSI: NLS_DATE_FORMAT independent DATE support
             when :date, :time, :datetime
-              "TO_DATE('#{value.to_s(:db)}','YYYY-MM-DD HH24:MI:SS')"
+              quote_date_with_to_date(value)
             else
               super
             end
+          elsif value.acts_like?(:date)
+            quote_date_with_to_date(value)
+          elsif value.acts_like?(:time)
+            value.to_i == value.to_f ? quote_date_with_to_date(value) : quote_timestamp_with_to_timestamp(value)
           else
             super
           end
@@ -264,6 +267,17 @@ begin
           "0"
         end
 
+        # RSI: should support that composite_primary_keys gem will pass date as string
+        def quote_date_with_to_date(value)
+          value = value.to_s(:db) if value.acts_like?(:date) || value.acts_like?(:time)
+          "TO_DATE('#{value}','YYYY-MM-DD HH24:MI:SS')"
+        end
+
+        def quote_timestamp_with_to_timestamp(value)
+          # add up to 9 digits of fractional seconds to inserted time
+          value = "#{value.to_s(:db)}.#{("%.6f"%value.to_f).split('.')[1]}" if value.acts_like?(:time)
+          "TO_TIMESTAMP('#{value}','YYYY-MM-DD HH24:MI:SS.FF6')"
+        end
 
         # CONNECTION MANAGEMENT ====================================
         #
@@ -858,3 +872,6 @@ rescue LoadError
                               "Custom create, update and delete methods will not be available."
   end
 end
+
+# RSI: load additional methods for composite_primary_keys support
+require 'active_record/connection_adapters/oracle_enhanced_cpk'

data/lib/active_record/connection_adapters/oracle_enhanced_cpk.rb

@@ -0,0 +1,20 @@
+module ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    module OracleEnhancedCpk #:nodoc:
+
+      # This mightn't be in Core, but count(distinct x,y) doesn't work for me
+      def supports_count_distinct? #:nodoc:
+        false
+      end
+      
+      def concat(*columns)
+        "(#{columns.join('||')})"
+      end
+      
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
+  include ActiveRecord::ConnectionAdapters::OracleEnhancedCpk
+end

data/lib/active_record/connection_adapters/oracle_enhanced_version.rb

@@ -3,7 +3,7 @@ module ActiveRecord #:nodoc:
     module OracleEnhancedVersion #:nodoc:
       MAJOR = 1
       MINOR = 1
-      TINY  = 3
+      TINY  = 4
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -716,4 +716,19 @@ describe "OracleEnhancedAdapter date and timestamp with different NLS date forma
     @employee.created_at_ts.should == @now
   end
 
+  it "should quote Date values with TO_DATE" do
+    @conn.quote(@today).should == "TO_DATE('#{@today.year}-#{"%02d" % @today.month}-#{"%02d" % @today.day}','YYYY-MM-DD HH24:MI:SS')"
+  end
+
+  it "should quote Time values with TO_DATE" do
+    @conn.quote(@now).should == "TO_DATE('#{@now.year}-#{"%02d" % @now.month}-#{"%02d" % @now.day} "+
+                                "#{"%02d" % @now.hour}:#{"%02d" % @now.min}:#{"%02d" % @now.sec}','YYYY-MM-DD HH24:MI:SS')"
+  end
+
+  it "should quote Time values with TO_TIMESTAMP" do
+    @ts = Time.at(@now.to_f + 0.1)
+    @conn.quote(@ts).should == "TO_TIMESTAMP('#{@ts.year}-#{"%02d" % @ts.month}-#{"%02d" % @ts.day} "+
+                                "#{"%02d" % @ts.hour}:#{"%02d" % @ts.min}:#{"%02d" % @ts.sec}.100000','YYYY-MM-DD HH24:MI:SS.FF6')"
+  end
+
 end

data/spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require "composite_primary_keys"
+
+describe "OracleEnhancedAdapter composite_primary_keys support" do
+
+  # Currently testing was done based on composite_primary_keys tests
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-10 00:00:00 +03:00
+date: 2008-07-15 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -30,10 +30,12 @@ files:
 - README.txt
 - lib/active_record/connection_adapters/oracle_enhanced.rake
 - lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+- lib/active_record/connection_adapters/oracle_enhanced_cpk.rb
 - lib/active_record/connection_adapters/oracle_enhanced_procedures.rb
 - lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced_version.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb