data_objects 0.10.2 → 0.10.3

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.3 2011-01-30
+* Reworked transactions
+* Fix a DST bug that could cause datetimes in the wrong timezone
+
 ## 0.10.2 2010-05-19
 * Support for Encoding.default_internal
 * Rework logging to adding a callback is possible

data/lib/data_objects/extension.rb

@@ -8,4 +8,4 @@ module DataObjects
     end
 
   end
-end
+end

data/lib/data_objects/spec/error/sql_error_spec.rb

@@ -0,0 +1,19 @@
+shared 'raising a SQLError' do
+
+  setup_test_environment
+
+  before do
+    @connection     = DataObjects::Connection.new(CONFIG.uri)
+    @invalid_query  = @connection.create_command("SLCT * FROM widgets WHERE ad_description = ? order by id")
+    @invalid_result = @connection.create_command("SELECT MAX((SELECT 1 UNION SELECT 2))")
+  end
+
+  it 'should raise an error on an invalid query' do
+    should.raise(DataObjects::SQLError) { @invalid_query.execute_reader('Buy this product now!') }
+  end
+
+  it 'should raise on an invalid result set' do
+    should.raise(DataObjects::SQLError) { @invalid_result.execute_reader }
+  end
+
+end

data/lib/data_objects/spec/reader_spec.rb

@@ -18,10 +18,14 @@ shared 'a Reader' do
 
   describe 'fields' do
 
+    def array_case_insensitively_equal_to(arr)
+      lambda { |obj| obj.map { |f| f.downcase } == arr }
+    end
+
     it 'should return the correct fields in the reader' do
       # we downcase the field names as some drivers such as do_derby, do_h2,
-      # do_hsqldb return the field names as uppercase
-      @reader.fields.map{ |f| f.downcase }.should == ['code', 'name']
+      # do_hsqldb, do_oracle return the field names as uppercase
+      @reader.fields.should.be array_case_insensitively_equal_to(['code', 'name'])
     end
 
   end

data/lib/data_objects/spec/typecast/datetime_spec.rb

@@ -63,6 +63,32 @@ shared 'supporting DateTime' do
 
     end
 
+    describe 'with manual typecasting a datetime column' do
+
+      before do
+        @command = @connection.create_command("SELECT release_datetime FROM widgets WHERE id = ? OR id = ? ORDER BY id")
+        @command.set_types(DateTime)
+        @reader = @command.execute_reader(1, 10)
+        @reader.next!
+        @feb_row = @reader.values
+        @reader.next!
+        @jul_row = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return the correct offset in Feb' do
+        (@feb_row.first.offset * 86400).to_i.should == Time.local(2008, 2, 14, 0, 31, 12).utc_offset
+      end
+
+      it 'should return the correct offset in Jul' do
+        (@jul_row.first.offset * 86400).to_i.should == Time.local(2008, 7, 14, 0, 31, 12).utc_offset
+      end
+
+    end
+
   end
 
   describe 'writing an DateTime' do

data/lib/data_objects/spec/typecast/integer_spec.rb

@@ -79,4 +79,23 @@ shared 'supporting Integer' do
 
   end
 
+  describe 'writing a big Integer' do
+
+    before do
+      @connection.create_command("UPDATE widgets SET super_number = ? WHERE id = 10").execute_non_query(2147483648) # bigger than Integer.MAX in java !!
+      @reader = @connection.create_command("SELECT super_number FROM widgets WHERE id = ?").execute_reader(10)
+      @reader.next!
+      @values = @reader.values
+    end
+
+    after do
+      @reader.close
+    end
+
+    it 'should return the correct entry' do
+      @values.first.should == 2147483648
+    end
+
+  end
+
 end

data/lib/data_objects/transaction.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'digest'
 require 'digest/sha2'
 
@@ -23,9 +24,10 @@ module DataObjects
     #
     # Creates a Transaction bound to a connection for the given DataObjects::URI
     #
-    def initialize(uri)
-      @connection = DataObjects::Connection.new(uri)
-      @id = Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:#{@@counter += 1}")
+    def initialize(uri, connection = nil)
+      @connection = connection || DataObjects::Connection.new(uri)
+      # PostgreSQL can't handle the full 64 bytes.  This should be enough for everyone.
+      @id = Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:#{@@counter += 1}")[0..-2]
     end
 
     # Close the connection for this Transaction
@@ -34,18 +36,15 @@ module DataObjects
     end
 
     def begin
-      cmd = "BEGIN"
-      connection.create_command(cmd).execute_non_query
+      run "BEGIN"
     end
 
     def commit
-      cmd = "COMMIT"
-      connection.create_command(cmd).execute_non_query
+      run "COMMIT"
     end
 
     def rollback
-      cmd = "ROLLBACK"
-      connection.create_command(cmd).execute_non_query
+      run "ROLLBACK"
     end
 
     def prepare; not_implemented; end;
@@ -54,9 +53,36 @@ module DataObjects
     def rollback_prepared; not_implemented; end;
     def prepare; not_implemented; end;
 
+  protected
+    def run(cmd)
+      connection.create_command(cmd).execute_non_query
+    end
+
   private
     def not_implemented
       raise NotImplementedError
     end
-  end
+  end # class Transaction
+
+  class SavePoint < Transaction
+    # We don't bounce through DO::<Adapter/scheme>::SavePoint because there
+    # doesn't appear to be any custom SQL to support this.
+    def self.create_for_uri(uri, connection)
+      uri = uri.is_a?(String) ? URI::parse(uri) : uri
+      DataObjects::SavePoint.new(uri, connection)
+    end
+
+    def begin
+      run %{SAVEPOINT "#{@id}"}
+    end
+
+    def commit
+      run %{RELEASE SAVEPOINT "#{@id}"}
+    end
+
+    def rollback
+      run %{ROLLBACK TO SAVEPOINT "#{@id}"}
+    end
+  end # class SavePoint
+
 end

data/lib/data_objects/version.rb

@@ -1,3 +1,3 @@
 module DataObjects
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 1
@@ -34,9 +37,11 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -47,9 +52,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
@@ -60,9 +67,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 5
@@ -103,6 +112,7 @@ files:
 - lib/data_objects/spec/command_spec.rb
 - lib/data_objects/spec/connection_spec.rb
 - lib/data_objects/spec/encoding_spec.rb
+- lib/data_objects/spec/error/sql_error_spec.rb
 - lib/data_objects/spec/helpers/immediate_red_green_output.rb
 - lib/data_objects/spec/helpers/pending.rb
 - lib/data_objects/spec/helpers/ssl.rb
@@ -153,23 +163,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataObjects basic API and shared driver specifications