activerecord-oracle_enhanced-adapter 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb7e8953228e3465f579ffe88d131c567000db2
-  data.tar.gz: 031021ed605f3226d77d04f76157c2473ff35e9a
+  metadata.gz: eef5dc051a873b8dc75975b556a46a45427f32b0
+  data.tar.gz: b81fefccb9c78bebadde53adc41a5a45746b2637
 SHA512:
-  metadata.gz: 694ae9892d14ccaea9ba755a41137eeceb193510fec5100333e0bf60ec7871fcd63ee8caac7ea073643fcdf473f25b6ba7e3768b4bf67b732dafd8ea067160d2
-  data.tar.gz: eb6efb4b84ad103278ea97bffbfa9e65d58994d5047aa23bf1a4085ff324193d66191b8cee100da00b38bed8068417a09f7ca85c9640bdf4bcf8d1ea1337cbcd
+  metadata.gz: 94c87c4500eee69bd24870ebb1306866c85cb6351d38a44d18d1a67660ab022cd39bdcd3905ccd35b4567b6ec16bcb14efce849717a4284ac9117df9d1aa458f
+  data.tar.gz: 504cc8085f6ab6114b7bec94a4363ebdad91e557e601ef9ee9c5242bf674cc567674dea2bc604c0ced037066d6236776d42e69285aff7ece680e2f1e34af00ec

data/History.md

@@ -1,3 +1,12 @@
+## 1.6.3 / 2015-08-14
+
+* Changes and bug fixes since 1.6.2
+ * Set sequence name automatically when new table name is longer than 26 bytes[#676]
+ * Add minimal specs for ActiveRecord::Base.limit() and .order()[#679]
+ * Use type_casted_binds [#681]
+ * Use type_cast_for_database to serialize correctly [#688]
+ * Suppress deprecated message for serialized_attributes [#688, #548, #687]
+
 ## 1.6.2 / 2015-07-20
 
 * Changes and bug fixes since 1.6.1

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

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.6.2"
+  s.version = "1.6.3"
 
   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{2015-07-20}
+  s.date = %q{2015-08-14}
   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/database_statements.rb

@@ -32,9 +32,9 @@ module ActiveRecord
 
               cursor = @statements[sql]
 
-              binds.each_with_index do |bind, i|
+              type_casted_binds.each_with_index do |bind, i|
                 col, val = bind
-                cursor.bind_param(i + 1, type_cast(val, col), col)
+                cursor.bind_param(i + 1, val, col)
               end
 
               cached = true
@@ -129,14 +129,14 @@ module ActiveRecord
 
               cursor = @statements[sql]
 
-              binds.each_with_index do |bind, i|
+              type_casted_binds.each_with_index do |bind, i|
                 col, val = bind
                 if col.returning_id?
                   returning_id_col = [col]
                   returning_id_index = i + 1
                   cursor.bind_returning_param(returning_id_index, Integer)
                 else
-                  cursor.bind_param(i + 1, type_cast(val, col), col)
+                  cursor.bind_param(i + 1, val, col)
                 end
               end
             end
@@ -154,7 +154,10 @@ module ActiveRecord
 
         # New method in ActiveRecord 3.1
         def exec_update(sql, name, binds)
-          log(sql, name, binds) do
+          type_casted_binds = binds.map { |col, val|
+            [col, type_cast(val, col)]
+          }
+          log(sql, name, type_casted_binds) do
             cached = false
             if without_prepared_statement?(binds)
               cursor = @connection.prepare(sql)
@@ -165,9 +168,9 @@ module ActiveRecord
                 @statements[sql] = @connection.prepare(sql)
               end
 
-              binds.each_with_index do |bind, i|
+              type_casted_binds.each_with_index do |bind, i|
                 col, val = bind
-                cursor.bind_param(i + 1, type_cast(val, col), col)
+                cursor.bind_param(i + 1, val, col)
               end
               cached = true
             end

data/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb

@@ -103,11 +103,8 @@ module ActiveRecord
           if new_name.to_s.length > table_name_length
             raise ArgumentError, "New table name '#{new_name}' is too long; the limit is #{table_name_length} characters"
           end
-          if "#{new_name}_seq".to_s.length > sequence_name_length
-            raise ArgumentError, "New sequence name '#{new_name}_seq' is too long; the limit is #{sequence_name_length} characters"
-          end
           execute "RENAME #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
-          execute "RENAME #{quote_table_name("#{table_name}_seq")} TO #{quote_table_name("#{new_name}_seq")}" rescue nil
+          execute "RENAME #{quote_table_name("#{table_name}_seq")} TO #{default_sequence_name(new_name)}" rescue nil
 
           rename_table_indexes(table_name, new_name)
         end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -826,7 +826,7 @@ module ActiveRecord
           value = attributes[col.name]
           # changed sequence of next two lines - should check if value is nil before converting to yaml
           next if value.nil?  || (value == '')
-          value = value.to_yaml if klass.serialized_attributes[col.name]
+          value = col.cast_type.type_cast_for_database(value)
           uncached do
             sql = is_with_cpk ? "SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)} WHERE #{klass.composite_where_clause(id)} FOR UPDATE" :
               "SELECT #{quote_column_name(col.name)} FROM #{quote_table_name(table_name)} WHERE #{quote_column_name(klass.primary_key)} = #{id} FOR UPDATE"

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -689,4 +689,60 @@ describe "OracleEnhancedAdapter" do
       explain.should include("INDEX UNIQUE SCAN")
     end
   end if ENV['RAILS_GEM_VERSION'] >= '3.2'
+
+  describe "using offset and limit" do
+    before(:all) do
+      @conn = ActiveRecord::Base.connection
+      @conn.execute "DROP TABLE test_employees" rescue nil
+      @conn.execute <<-SQL
+        CREATE TABLE test_employees (
+          id            NUMBER PRIMARY KEY,
+          sort_order    NUMBER(38,0),
+          first_name    VARCHAR2(20),
+          last_name     VARCHAR2(25),
+          updated_at    DATE,
+          created_at    DATE
+        )
+      SQL
+      @conn.execute "DROP SEQUENCE test_employees_seq" rescue nil
+      @conn.execute <<-SQL
+        CREATE SEQUENCE test_employees_seq  MINVALUE 1
+          INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER NOCYCLE
+      SQL
+      @employee = Class.new(ActiveRecord::Base) do
+        self.table_name = :test_employees
+      end
+      i = 0
+      @employee.create!(sort_order: i+=1, first_name: 'Peter',   last_name: 'Parker')
+      @employee.create!(sort_order: i+=1, first_name: 'Tony',    last_name: 'Stark')
+      @employee.create!(sort_order: i+=1, first_name: 'Steven',  last_name: 'Rogers')
+      @employee.create!(sort_order: i+=1, first_name: 'Bruce',   last_name: 'Banner')
+      @employee.create!(sort_order: i+=1, first_name: 'Natasha', last_name: 'Romanova')
+    end
+
+    after(:all) do
+      @conn.execute "DROP TABLE test_employees"
+      @conn.execute "DROP SEQUENCE test_employees_seq"
+    end
+
+    after(:each) do
+      ActiveRecord::Base.connection.clear_ignored_table_columns
+      ActiveRecord::Base.clear_cache! if ActiveRecord::Base.respond_to?(:"clear_cache!")
+    end
+
+    it "should return n records with limit(n)" do
+      @employee.limit(3).to_a.size.should be(3)
+    end
+
+    it "should return less than n records with limit(n) if there exist less than n records" do
+      @employee.limit(10).to_a.size.should be(5)
+    end
+
+    it "should return the records starting from offset n with offset(n)" do
+      expect(@employee.order(:sort_order).first.first_name.should).to eq("Peter")
+      expect(@employee.order(:sort_order).offset(0).first.first_name.should).to eq("Peter")
+      expect(@employee.order(:sort_order).offset(1).first.first_name.should).to eq("Tony")
+      expect(@employee.order(:sort_order).offset(4).first.first_name.should).to eq("Natasha")
+    end
+  end
 end

data/spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb

@@ -1076,6 +1076,20 @@ describe "OracleEnhancedAdapter handling of CLOB columns" do
     @employee.comments.should == @char_data
   end
 
+  it "should store serializable ruby data structures" do
+    ruby_data1 = {"arbitrary1" => ["ruby", :data, 123]}
+    ruby_data2 = {"arbitrary2" => ["ruby", :data, 123]}
+    @employee = Test2Employee.create!(
+      :comments => ruby_data1
+    )
+    @employee.reload
+    @employee.comments.should == ruby_data1
+    @employee.comments = ruby_data2
+    @employee.save
+    @employee.reload
+    @employee.comments.should == ruby_data2
+  end
+
   it "should keep unchanged serialized data when other columns changed" do
     @employee = Test2Employee.create!(
       :first_name => "First",

data/spec/active_record/connection_adapters/oracle_enhanced_schema_statements_spec.rb

@@ -438,10 +438,10 @@ describe "OracleEnhancedAdapter schema definition" do
       end.should raise_error
     end
 
-    it "should raise error when new sequence name length is too long" do
+    it "should not raise error when new sequence name length is too long" do
       lambda do
         @conn.rename_table("test_employees","a"*27)
-      end.should raise_error
+      end.should_not raise_error
     end
 
     it "should rename table when table has no primary key and sequence" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler