data_objects 0.10.8 → 0.10.9

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.9 2012-08-13
+
+* Don't try to escape queries when no binding parameters are given
+
 ## 0.10.8 2012-02-10
 
 * Ruby 1.9.3 compatibility on Windows

data/lib/data_objects/command.rb

@@ -52,6 +52,7 @@ module DataObjects
     # This method is meant mostly for adapters that don't support
     # bind-parameters.
     def escape_sql(args)
+      return @text if args.empty?
       sql = @text.dup
       vars = args.dup
 

data/lib/data_objects/spec/shared/command_spec.rb

@@ -7,9 +7,11 @@ shared_examples_for 'a Command' do
   end
 
   before do
-    @connection = DataObjects::Connection.new(CONFIG.uri)
-    @command    = @connection.create_command("INSERT INTO users (name) VALUES (?)")
-    @reader     = @connection.create_command("SELECT code, name FROM widgets WHERE ad_description = ?")
+    @connection  = DataObjects::Connection.new(CONFIG.uri)
+    @command     = @connection.create_command("INSERT INTO users (name) VALUES (?)")
+    @reader      = @connection.create_command("SELECT code, name FROM widgets WHERE ad_description = ?")
+    @arg_command = @connection.create_command("INSERT INTO users (name, fired_at) VALUES (?, ?)")
+    @arg_reader  = @connection.create_command("SELECT code, name FROM widgets WHERE ad_description = ? AND whitepaper_text = ?")
   end
 
   after do
@@ -32,14 +34,14 @@ shared_examples_for 'a Command' do
         expect { @invalid_command.execute_non_query }.to raise_error(DataObjects::SQLError)
       end
 
-      it 'should raise an error with too few binding parameters' do
-        expect { @command.execute_non_query("Too", "Many") }.to raise_error(ArgumentError,
-          /Binding mismatch: 2 for 1/)
+      it 'should raise an error with too many binding parameters' do
+        expect { @arg_command.execute_non_query("Too", Date.today, "Many") }.to raise_error(ArgumentError,
+          /Binding mismatch: 3 for 2/)
       end
 
-      it 'should raise an error with too many binding parameters' do
-        expect { @command.execute_non_query }.to raise_error(ArgumentError,
-          /Binding mismatch: 0 for 1/)
+      it 'should raise an error with too few binding parameters' do
+        expect { @arg_command.execute_non_query("Few") }.to raise_error(ArgumentError,
+          /Binding mismatch: 1 for 2/)
       end
 
     end
@@ -47,7 +49,7 @@ shared_examples_for 'a Command' do
     describe 'with a valid statement' do
 
       it 'should not raise an error with an explicit nil as parameter' do
-        expect { @command.execute_non_query(nil) }.not_to raise_error(ArgumentError)
+        expect { @arg_command.execute_non_query(nil, nil) }.not_to raise_error(ArgumentError)
       end
 
     end
@@ -73,7 +75,7 @@ shared_examples_for 'a Command' do
     describe 'with an invalid reader' do
 
       before do
-        @invalid_reader = @connection.create_command("SELECT * FROM non_existent_widgets WHERE ad_description = ?")
+        @invalid_reader = @connection.create_command("SELECT * FROM non_existent_widgets WHERE ad_description = ? AND white_paper_text = ?")
       end
 
       it 'should raise an error on an invalid query' do
@@ -81,14 +83,14 @@ shared_examples_for 'a Command' do
         expect { @invalid_reader.execute_reader }.to raise_error # (ArgumentError, DataObjects::SQLError)
       end
 
-      it 'should raise an error with too few binding parameters' do
-        expect { @reader.execute_reader("Too", "Many") }.to raise_error(ArgumentError,
-          /Binding mismatch: 2 for 1/)
+      it 'should raise an error with too many few binding parameters' do
+        expect { @arg_reader.execute_reader("Too", "Many", "Args") }.to raise_error(ArgumentError,
+          /Binding mismatch: 3 for 2/)
       end
 
-      it 'should raise an error with too many binding parameters' do
-        expect { @reader.execute_reader }.to raise_error(ArgumentError,
-          /Binding mismatch: 0 for 1/)
+      it 'should raise an error with too few binding parameters' do
+        expect { @arg_reader.execute_reader("Few") }.to raise_error(ArgumentError,
+          /Binding mismatch: 1 for 2/)
       end
 
     end
@@ -96,7 +98,7 @@ shared_examples_for 'a Command' do
     describe 'with a valid reader' do
 
       it 'should not raise an error with an explicit nil as parameter' do
-        expect { @reader.execute_reader(nil) }.not_to raise_error(ArgumentError)
+        expect { @arg_reader.execute_reader(nil, nil) }.not_to raise_error(ArgumentError)
       end
 
     end
@@ -127,7 +129,7 @@ shared_examples_for 'a Command' do
       end
 
       it 'should raise an error when types are set' do
-        expect { @command.execute_non_query }.to raise_error(ArgumentError)
+        expect { @arg_command.execute_non_query("Few") }.to raise_error(ArgumentError)
       end
 
     end

data/lib/data_objects/spec/shared/connection_spec.rb

@@ -1,3 +1,13 @@
+def test_connection(conn)
+  reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
+  reader.next!
+  result = reader.values[0]
+  result
+ensure
+  reader.close
+  conn.close
+end
+
 shared_examples_for 'a Connection' do
 
   before :all do
@@ -25,21 +35,15 @@ shared_examples_for 'a Connection' do
   end
 
   describe 'various connection URIs' do
-    def test_connection(conn)
-      reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
-      reader.next!
-      reader.values[0]
-    end
 
     it 'should open with an uri object' do
       uri = DataObjects::URI.new(
-              @driver,
-              @user,
-              @password,
-              @host,
-              @port && @port.to_i,
-              @database,
-              nil, nil
+              :scheme   => @driver,
+              :user     => @user,
+              :password => @password,
+              :host     => @host,
+              :port     => @port && @port.to_i,
+              :path     => @database
             )
       conn = DataObjects::Connection.new(uri)
       test_connection(conn).should == 1
@@ -109,10 +113,6 @@ shared_examples_for 'a Connection with authentication support' do
       lambda { DataObjects::Connection.new(uri) }
     end
 
-    it 'should raise an error if no database specified' do
-      connecting_with("#{@driver}://#{@user}:#{@password}@#{@host}:#{@port}").should raise_error #(ArgumentError, DataObjects::Error)
-    end
-
     it 'should raise an error if bad username is given' do
       connecting_with("#{@driver}://thisreallyshouldntexist:#{@password}@#{@host}:#{@port}#{@database}").should raise_error #(ArgumentError, DataObjects::Error)
     end
@@ -137,14 +137,13 @@ shared_examples_for 'a Connection with authentication support' do
 
 end
 
-def test_connection(conn)
-  reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
-  reader.next!
-  result = reader.values[0]
-  result
-ensure
-  reader.close
-  conn.close
+shared_examples_for 'a Connection allowing default database' do
+  describe 'with a URI without a database' do
+    it 'should connect properly' do
+      conn = DataObjects::Connection.new("#{@driver}://#{@user}:#{@password}@#{@host}:#{@port}")
+      test_connection(conn).should == 1
+    end
+  end
 end
 
 shared_examples_for 'a Connection with JDBC URL support' do

data/lib/data_objects/spec/shared/typecast/string_spec.rb

@@ -41,7 +41,7 @@ shared_examples_for 'supporting String' do
     describe 'with manual typecasting' do
 
       before do
-        @command = @connection.create_command("SELECT weight FROM widgets WHERE ad_description = ?")
+        @command = @connection.create_command("SELECT number_sold FROM widgets WHERE ad_description = ?")
         @command.set_types(String)
         @reader = @command.execute_reader('Buy this product now!')
         @reader.next!
@@ -57,7 +57,7 @@ shared_examples_for 'supporting String' do
       end
 
       it 'should return the correct result' do
-        @values.first.should == "13.4"
+        @values.first.should == "0"
       end
 
     end

data/lib/data_objects/version.rb

@@ -1,3 +1,3 @@
 module DataObjects
-  VERSION = '0.10.8'
+  VERSION = '0.10.9'
 end

data/spec/pooling_spec.rb

@@ -148,7 +148,7 @@ describe "DataObjects::Pooling" do
     bob = Person.new('Bob')
     bob.release
     DataObjects.exiting = true
-    sleep(0.1)
+    sleep(1)
     DataObjects::Pooling.scavenger?.should be_false
   end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 8
-  version: 0.10.8
+  - 9
+  version: 0.10.9
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 Z
+date: 2011-03-29 00:00:00 +02: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
@@ -36,11 +34,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
@@ -51,11 +47,9 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 5
@@ -135,6 +129,7 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
+has_rdoc: true
 homepage: http://github.com/datamapper/do
 licenses: []
 
@@ -144,27 +139,23 @@ 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.8.14
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects basic API and shared driver specifications