fluiddb 0.0.29 → 0.0.31

data/lib/FluidDb.rb

@@ -24,6 +24,7 @@ module FluidDb
     class Base
         
         attr_writer :verbose
+        attr_reader :connection
         
         @connection;
         @uri
@@ -34,14 +35,14 @@ module FluidDb
         # @param [String] uri a location for the resource to which we will attach, eg mysql://user:pass@127.0.0.1/foo
         def initialize(uri)
             if uri.kind_of? String then
-                @uri = Uri.parse( uri )
+                @uri = URI.parse( uri )
                 else
                 @uri = uri
             end
             
             self.connect
         end
-        
+
         def splice_sql( sql, params )
             
             if params.length != sql.count( "?" ) then

data/lib/FluidDb/Pgsql.rb

@@ -94,25 +94,36 @@ module FluidDb
         
         
         def execute( sql, params, expected_affected_rows=nil )
-            #            sql = self.format_to_sql( sql, params )
+            sql = self.format_to_sql( sql, params )
+            r = @connection.exec(sql)
 
-            parts = sql.split( "?" )
+            if !expected_affected_rows.nil? and
+                r.cmd_tuples != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.cmd_tuples}")
+            end
+            rescue PG::Error => e
+                raise DuplicateKeyError.new( e.message ) unless e.message.index( "duplicate key value violates unique constraint" ).nil?
+            
+                raise e
+        end
+        
+        def exec_params( sql, params, expected_affected_rows=nil )
+                        parts = sql.split( "?" )
             sql = ""
             parts.each_with_index do |p,idx|
                 sql = sql + p;
                 sql = sql + "$#{idx+1}" if idx < parts.length - 1
             end
-            
             r = @connection.exec_params( sql, params );
-
+            
             if !expected_affected_rows.nil? and
                 r.cmd_tuples != expected_affected_rows then
                 raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.cmd_tuples}")
             end
             rescue PG::Error => e
-                raise DuplicateKeyError.new( e.message ) unless e.message.index( "duplicate key value violates unique constraint" ).nil?
+            raise DuplicateKeyError.new( e.message ) unless e.message.index( "duplicate key value violates unique constraint" ).nil?
             
-                raise e
+            raise e
         end
         
         def insert( sql, params )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com