@@ -2,3 +2,5 @@ doc pkg log tmp +sqlnet.log + .gitignore @@ -1,3 +1,8 @@ +== 1.1.2 2008-07-08 +* Bug fixes: + * Changed date column name recognition - now should match regex /(^|_)date(_|$)/i + (previously "updated_at" was recognized as :date column and not as :datetime) + == 1.1.1 2008-06-28 * Enhancements: History.txt @@ -160,14 +160,14 @@ begin @@emulate_dates_by_column_name = false cattr_accessor :emulate_dates_by_column_name def self.is_date_column?(name) - name =~ /date/i + name =~ /(^|_)date(_|$)/i end # RSI: set to true if NUMBER columns with ID at the end of their name should be emulated as integers @@emulate_integers_by_column_name = false cattr_accessor :emulate_integers_by_column_name def self.is_integer_column?(name) - name =~ /^id$/i || name =~ /_id$/i + name =~ /(^|_)id$/i end # RSI: set to true if CHAR(1), VARCHAR2(1) columns or VARCHAR2 columns with FLAG or YN at the end of their name lib/active_record/connection_adapters/oracle_enhanced_adapter.rb @@ -134,7 +134,8 @@ describe "OracleEnhancedAdapter date type detection based on column names" do commission_pct NUMBER(2,2), manager_id NUMBER(6,0), department_id NUMBER(4,0), - created_at DATE + created_at DATE, + updated_at DATE ) SQL @conn.execute <<-SQL @@ -155,20 +156,27 @@ describe "OracleEnhancedAdapter date type detection based on column names" do column.type.should == :datetime end - it "should set DATE column type as date if column name contains 'date' and emulate_dates_by_column_name is true" do + it "should set DATE column type as date if column name contains '_date_' and emulate_dates_by_column_name is true" do ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true columns = @conn.columns('test_employees') column = columns.detect{|c| c.name == "hire_date"} column.type.should == :date end - it "should set DATE column type as datetime if column name does not contain 'date' and emulate_dates_by_column_name is true" do + it "should set DATE column type as datetime if column name does not contain '_date_' and emulate_dates_by_column_name is true" do ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true columns = @conn.columns('test_employees') column = columns.detect{|c| c.name == "created_at"} column.type.should == :datetime end + it "should set DATE column type as datetime if column name contains 'date' as part of other word and emulate_dates_by_column_name is true" do + ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = true + columns = @conn.columns('test_employees') + column = columns.detect{|c| c.name == "updated_at"} + column.type.should == :datetime + end + it "should return Time value from DATE column if emulate_dates_by_column_name is false" do ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.emulate_dates_by_column_name = false columns = @conn.columns('test_employees') spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb a7c71d246ea80dca782e6602d50d862dedf61263 Raimonds Simanovskis raymond@mbrs.alise.lv http://github.com/rsim/oracle-enhanced/commit/e986f159771184911f4e28f28cd430777c99e2d3 e986f159771184911f4e28f28cd430777c99e2d3 2008-07-08T09:22:42-07:00 2008-07-08T09:22:42-07:00 Changed date column name recognition f613baf7a0d4af423e11a978ffeb435682199142 Raimonds Simanovskis raymond@mbrs.alise.lv