fluiddb 0.0.32 → 0.1.0

data/lib/FluidDb/Db.rb

@@ -15,6 +15,9 @@ module FluidDb
             when "pgsql"
             require "FluidDb/Pgsql"
             return FluidDb::Pgsql.new( uri )
+            when "fb"
+            require "FluidDb/Firebird"
+            return FluidDb::Firebird.new( uri )
             when "mock"
             require "FluidDb/Mock"
             return FluidDb::Mock.new( uri )

data/lib/FluidDb/Firebird.rb

@@ -0,0 +1,141 @@
+require "FluidDb"
+require "fb"
+include Fb
+
+module FluidDb
+    
+    class Firebird<Base
+
+        # Connect to Db.
+        #
+        # @param [String] uri a location for the resource to which we will attach, eg mysql://user:pass@127.0.0.1/foo
+        def connect()
+            uri = @uri
+            
+            user = uri.user || "sysdba"
+            password = uri.password || "masterkey"
+            
+            
+            # The Database class acts as a factory for Connections.
+            # It can also create and drop databases.
+            db = Database.new(
+                              :database => "#{uri.host}:#{uri.path}",
+                              :username => user,
+                              :password => password)
+            # :database is the only parameter without a default.
+            # Let's connect to the database, creating it if it doesn't already exist.
+            @connection = db.connect rescue db.create.connect
+
+        end
+
+        def close
+            @connection.close
+        end
+
+        def queryForArray( sql, params )
+            sql = self.format_to_sql( sql, params )
+            list = @connection.query(:hash, sql)
+
+            #        if ( $result === false ) then
+            #    $message = pg_last_error( $this->connection );
+            #    throw new Fluid_ConnectionException( $message );
+            #end
+
+            case list.length
+                when -1
+                raise FluidDb::ConnectionError.new
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                return list[0]
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+        end
+        
+        def queryForValue( 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.length
+                when -1
+                raise FluidDb::ConnectionError.new
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                return results[0][0]
+                #                return results.getvalue(0,0)
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+            
+        end
+        
+        
+        def queryForResultset( sql, params )
+            sql = self.format_to_sql( sql, params )
+            list = @connection.query(:hash, sql)
+            
+            #        if ( $result === false ) then
+            #    $message = pg_last_error( $this->connection );
+            #    throw new Fluid_ConnectionException( $message );
+            #end
+            
+            case list.length
+                when -1
+                raise FluidDb::ConnectionError.new
+                else
+                
+                return list
+            end
+        end
+        
+        
+        def execute( sql, params, expected_affected_rows=nil )
+            sql = self.format_to_sql( sql, params )
+            
+            self.verboseLog( "#{self.class.name}.execute. #{sql}" )
+            affected_rows = @connection.execute(sql)
+
+            if !expected_affected_rows.nil? and
+                affected_rows != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{affected_rows}")
+            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
+            affected_rows = @connection.exec_params( sql, params );
+            
+            if !expected_affected_rows.nil? and
+                affected_rows != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{affected_rows}")
+            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 insert( sql, params )
+            raise "Pgsql uses SEQUENCES, so possibly easier to use 2 executes"
+            #            self.execute( sql, params )
+            #return @connection.last_id
+        end
+        
+    end
+    
+end

data/lib/FluidDb/TinyTds.rb

@@ -85,7 +85,7 @@ module FluidDb
         def queryForResultset( sql, params )
             sql = self.format_to_sql( sql, params )
             results = @connection.execute(sql)
-
+            
             list = Array.new
             results.each do |row|
                 list << row

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-08-18 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/Db.rb
+- lib/FluidDb/Firebird.rb
 - lib/FluidDb/Mock.rb
 - lib/FluidDb/Mysql.rb
 - lib/FluidDb/Mysql2.rb