fluiddb 0.0.5 → 0.0.6

data/lib/FluidDb.rb

@@ -11,6 +11,8 @@ module FluidDb
     end
     class ParamTypeNotSupportedError<StandardError
     end
+    class ExpectedAffectedRowsError<StandardError
+    end
     
     class Base
         
@@ -40,6 +42,15 @@ module FluidDb
             
             return sql
         end
+
+        def convertTupleToHash( fields, tuple, j )
+            hash = Hash.new
+            0.upto( fields.length-1 ).each do |i|
+                hash[fields[i].to_s] = tuple.getvalue(j, i)
+            end
+            
+            return hash
+        end        
         
         def queryForArray( sql, params )
             raise NotImplementedError.new("You must implement 'queryForArray'.")

data/lib/FluidDb/Mysql.rb

@@ -1,17 +1,14 @@
 require "FluidDb"
-require "mysql2"
+require "mysql"
 
 module FluidDb
-
+    
     class Mysql<Base
         
         def initialize(uri)
-            host = uri.host
             database = uri.path.sub( "/", "" )
             
-            @connection = Mysql2::Client.new(:host => uri.host,
-                                             :database => uri.path.sub( "/", "" ),
-                                             :username => uri.user )
+            @connection = ::Mysql.new uri.host, uri.user, uri.password, database, nil, nil, ::Mysql::CLIENT_FOUND_ROWS
         end
         
         def queryForArray( sql, params )
@@ -23,33 +20,30 @@ module FluidDb
             #    throw new Fluid_ConnectionException( $message );
             #end
             
-            case results.count
+            case results.num_rows
                 when -1
                 raise FluidDb::ConnectionError.new
                 when 0
                 raise FluidDb::NoDataFoundError.new
                 when 1
-                r=nil;
-                results.each do |row|
-                    r=row
-                end
+                r = results.fetch_hash
                 return r
                 else
                 raise FluidDb::TooManyRowsError.new
             end
             
         end
-
+        
         def queryForValue( sql, params )
             sql = self.format_to_sql( sql, params )
-            results = @connection.query(sql, :as => :array)
-
+            results = @connection.query(sql)
+            
             #        if ( $result === false ) then
             #    $message = pg_last_error( $this->connection );
             #    throw new Fluid_ConnectionException( $message );
             #end
             
-            case results.count
+            case results.num_rows
                 when -1
                 raise FluidDb::ConnectionError.new
                 when 0
@@ -76,24 +70,33 @@ module FluidDb
             #    throw new Fluid_ConnectionException( $message );
             #end
             
-            case results.count
+            case results.num_rows
                 when -1
                 raise FluidDb::ConnectionError.new
                 else
-                return results
+                list = Array.new
+                results.each_hash do |row|
+                    list.push row
+                end
+                
+                return list
             end
         end
-        
-        
-        #    def execute( sql, params, expected_affected_rows )
-        def execute( sql, params )
+
+        def execute( sql, params, expected_affected_rows=nil )
             sql = self.format_to_sql( sql, params )
+            #            puts "sql: #{sql}"
             @connection.query( sql );
+            
+            if !expected_affected_rows.nil? and
+                @connection.affected_rows != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{@connection.affected_rows}")
+            end
         end
-        
+
         def insert( sql, params )
             self.execute( sql, params )
-            return @connection.last_id
+            return @connection.insert_id
         end
         
     end

data/lib/FluidDb/Mysql2.rb

@@ -0,0 +1,112 @@
+require "FluidDb"
+require "mysql2"
+
+module FluidDb
+    
+    class Mysql2<Base
+
+        def initialize(uri)
+            host = uri.host
+            database = uri.path.sub( "/", "" )
+            
+            
+            @connection = ::Mysql2::Client.new(:host => uri.host,
+                                               :database => uri.path.sub( "/", "" ),
+                                               :username => uri.user,
+                                               :flags => ::Mysql2::Client::FOUND_ROWS )
+        end
+        
+        def queryForArray( sql, params )
+            sql = self.format_to_sql( sql, params )
+            results = @connection.query(sql)
+            
+            #        if ( $result === false ) then
+            #    $message = pg_last_error( $this->connection );
+            #    throw new Fluid_ConnectionException( $message );
+            #end
+            
+            case results.count
+                when -1
+                raise FluidDb::ConnectionError.new
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                r=nil;
+                results.each do |row|
+                    r=row
+                end
+                return r
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+            
+        end
+        
+        def queryForValue( sql, params )
+            sql = self.format_to_sql( sql, params )
+            results = @connection.query(sql, :as => :array)
+            
+            #        if ( $result === false ) then
+            #    $message = pg_last_error( $this->connection );
+            #    throw new Fluid_ConnectionException( $message );
+            #end
+            
+            case results.count
+                when -1
+                raise FluidDb::ConnectionError.new
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                r=nil;
+                results.each do |row|
+                    r=row
+                end
+                return r[0]
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+            
+        end
+        
+        
+        def queryForResultset( sql, params )
+            sql = self.format_to_sql( sql, params )
+            results = @connection.query(sql)
+            
+            #        if ( $result === false ) then
+            #    $message = pg_last_error( $this->connection );
+            #    throw new Fluid_ConnectionException( $message );
+            #end
+            
+            case results.count
+                when -1
+                raise FluidDb::ConnectionError.new
+                else
+                list = Array.new
+                results.each do |row|
+                    list.push row
+                end
+                
+                return list
+            end
+        end
+        
+        def execute( sql, params, expected_affected_rows=nil )
+            sql = self.format_to_sql( sql, params )
+            @connection.query( sql );
+            
+            if !expected_affected_rows.nil? and
+                @connection.affected_rows != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{@connection.affected_rows}")
+            end
+        end
+        
+        
+        def insert( sql, params )
+            self.execute( sql, params )
+            return @connection.last_id
+        end
+        
+    end
+    
+end

data/lib/FluidDb/Pgsql.rb

@@ -11,16 +11,7 @@ module FluidDb
             
             @connection = PG.connect( dbname:uri.path.sub( "/", "" ) )
         end
-        
-        def convertTupleToHash( fields, tuple, j )
-            hash = Hash.new
-            0.upto( fields.length-1 ).each do |i|
-                hash[fields[i].to_s] = tuple.getvalue(j, i)
-            end
-            
-            return hash
-        end
-        
+
         def queryForArray( sql, params )
             sql = self.format_to_sql( sql, params )
             results = @connection.exec(sql)
@@ -89,17 +80,22 @@ module FluidDb
         end
         
         
-        #    def execute( sql, params, expected_affected_rows )
-        def execute( sql, params )
+        def execute( sql, params, expected_affected_rows=nil )
             sql = self.format_to_sql( sql, params )
-            @connection.query( sql );
+            r = @connection.query( sql );
+            
+            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
         end
-        
+
         def insert( sql, params )
-            self.execute( sql, params )
-            return @connection.last_id
+            raise "Pgsql uses SEQUENCES, so possibly easier to use 2 executes"
+            #            self.execute( sql, params )
+            #return @connection.last_id
         end
-        
+
     end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/FluidDb/Mysql.rb
+- lib/FluidDb/Mysql2.rb
 - lib/FluidDb/Pgsql.rb
 - lib/FluidDb.rb
 - README.md