fluiddb 0.1.15 → 0.1.17

data/lib/FluidDb/Db.rb

@@ -1,33 +1,36 @@
 require "FluidDb"
 
 module FluidDb
-    
-    def FluidDb.Db( uri )
-	uri = URI.parse( uri ) if uri.is_a? String
-        
-        case uri.scheme
-            when "mysql"
-            require "FluidDb/Mysql"
-            return FluidDb::Mysql.new( uri )
-            when "mysql2"
-            require "FluidDb/Mysql2"
-            return FluidDb::Mysql2.new( uri )
-            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 )
-            when "tinytds"
-            require "FluidDb/TinyTds"
-            return FluidDb::TinyTds.new( uri )
 
-            else
-            abort("Scheme, #{uri.scheme}, not recognised when configuring creating db connection");
-        end
-        
+  def FluidDb.Db( uri )
+    uri = URI.parse( uri ) if uri.is_a? String
+
+    case uri.scheme
+    when "mysql"
+      require "FluidDb/Mysql"
+      return FluidDb::Mysql.new( uri )
+    when "mysql2"
+      require "FluidDb/Mysql2"
+      return FluidDb::Mysql2.new( uri )
+    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 )
+    when "tinytds"
+      require "FluidDb/TinyTds"
+      return FluidDb::TinyTds.new( uri )
+    when "sqlite"
+      require "FluidDb/SQLite"
+      return FluidDb::SQLite.new( uri )
+      
+    else
+      abort("Scheme, #{uri.scheme}, not recognised when configuring creating db connection");
     end
+
+  end
 end

data/lib/FluidDb/Mock.rb

@@ -30,6 +30,8 @@ end
 
 	def getSqlFromHash( sql )
 		raise SqlNotMatchedError.new( sql ) unless @hash.has_key?( sql )
+
+		return @hash[sql]
 	end
         
         def queryForArray( sql, params=[] )

data/lib/FluidDb/SQLite.rb

@@ -0,0 +1,135 @@
+require "FluidDb"
+require "sqlite3"
+
+module FluidDb
+
+    class SQLite<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
+            @connection = SQLite3::Database.new uri.path
+        end
+
+        def close
+            @connection.close
+        end
+
+        def queryForArray( sql, params=[] )
+            sql = self.format_to_sql( sql, params )
+            @connection.results_as_hash = true
+            results = @connection.execute(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]
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+        end
+
+        def queryForValue( sql, params=[] )
+            sql = self.format_to_sql( sql, params )
+            @connection.results_as_hash = false
+            results = @connection.execute(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]
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+
+        end
+
+
+        def queryForResultset( sql, params=[] )
+            sql = self.format_to_sql( sql, params )
+            @connection.results_as_hash = true
+            results = @connection.execute(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
+                else
+                return results
+            end
+        end
+
+
+        def execute( sql, params=[], expected_affected_rows=nil )
+            sql = self.format_to_sql( sql, params )
+
+            self.verboseLog( "#{self.class.name}.execute. #{sql}" )
+            r = @connection.execute(sql)
+
+            if !expected_affected_rows.nil? and
+                r.changes != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.cmd_tuples}")
+            end
+        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.changes != expected_affected_rows then
+                raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.cmd_tuples}")
+            end
+        end
+
+        # Transaction Semantics
+        def Begin
+            @connection.transaction
+        end
+
+        # Transaction Semantics
+        def Commit
+            @connection.commit
+        end
+
+        # Transaction Semantics
+        def Rollback
+            @connection.rollback
+        end
+
+        def insert( sql, params )
+            raise "SQLite 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.1.15
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com
@@ -23,6 +23,7 @@ files:
 - lib/FluidDb/Mysql.rb
 - lib/FluidDb/Mysql2.rb
 - lib/FluidDb/Pgsql.rb
+- lib/FluidDb/SQLite.rb
 - lib/FluidDb/TinyTds.rb
 - lib/FluidDb.rb
 - README.md