fluiddb 0.1.10 → 0.1.13

data/lib/FluidDb.rb

@@ -132,7 +132,7 @@ module FluidDb
         end
         
         # Return a single row from the database, given the sql parameter.
-        # Throwa an error for no data.
+        # Throws an error for no data.
         # Throws an error for more than 1 row
         #
         # @param [String] sql The SELECT statement to run
@@ -142,7 +142,7 @@ module FluidDb
         end
         
         # Return a single value is returned from a single row from the database, given the sql parameter.
-        # Throwa an error for no data.
+        # Throws an error for no data.
         # Throws an error for more than 1 row
         #
         # @param [String] sql The SELECT statement to run

data/lib/FluidDb/Mock.rb

@@ -4,10 +4,11 @@ module FluidDb
     
     #A constant way of enabling testing for FluidDb
     class Mock<Base
+        attr_reader :hash
         
         @verbose = false
         
-        def initialize
+        def initialize(uri)
             @hash = Hash.new
             
         end

data/lib/FluidDb/Pgsql.rb

@@ -17,23 +17,23 @@ module FluidDb
             hash["port"] = uri.port unless uri.port.nil?
             hash["user"] = uri.user unless uri.user.nil?
             hash["password"] = uri.password unless uri.password.nil?
-
+            
             @connection = PG.connect( hash )
         end
-
+        
         def close
             @connection.close
         end
-
+        
         def queryForArray( sql, params=[] )
             sql = self.format_to_sql( sql, params )
             results = @connection.exec(sql)
-
+            
             #        if ( $result === false ) then
             #    $message = pg_last_error( $this->connection );
             #    throw new Fluid_ConnectionException( $message );
             #end
-
+            
             case results.num_tuples
                 when -1
                 raise FluidDb::ConnectionError.new
@@ -98,19 +98,19 @@ module FluidDb
             
             self.verboseLog( "#{self.class.name}.execute. #{sql}" )
             r = @connection.exec(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
             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 exec_params( sql, params=[], expected_affected_rows=nil )
-                        parts = sql.split( "?" )
+            parts = sql.split( "?" )
             sql = ""
             parts.each_with_index do |p,idx|
                 sql = sql + p;
@@ -128,6 +128,21 @@ module FluidDb
             raise e
         end
         
+        # Transaction Semantics
+        def Begin
+            @connection.exec( "BEGIN", [] )
+        end
+        
+        # Transaction Semantics
+        def Commit
+            @connection.exec( "COMMIT", [] )
+        end
+        
+        # Transaction Semantics
+        def Rollback
+            @connection.exec( "ROLLBACK", [] )
+        end
+        
         def insert( sql, params )
             raise "Pgsql uses SEQUENCES, so possibly easier to use 2 executes"
             #            self.execute( sql, params )

data/lib/FluidDb/TinyTds.rb

@@ -11,7 +11,7 @@ module FluidDb
         # @param [String] uri a location for the resource to which we will attach, eg tinytds://<user>:<pass>@<dataserver>/<database>
         def connect()
             uri = @uri
-            
+
             dataserver = uri.host
             database = uri.path.sub( "/", "" )
             username = URI.unescape( uri.user )
@@ -30,16 +30,34 @@ module FluidDb
             end
             
             hash = Hash[:username, username, :password, password, :database, database, :dataserver, dataserver]
+            failOverDataServer = nil
             if !uri.query.nil? then
                 cgi = CGI.parse( uri.query )
                 hash[:timeout] = cgi["timeout"][0].to_i if cgi.has_key?( "timeout" )
+                
+                failOverDataServer = cgi["failoverdataserver"][0] if cgi.has_key?( "failoverdataserver" )
             end
 
-            @connection = ::TinyTds::Client.new( hash )            
+            begin
+                @connection = ::TinyTds::Client.new( hash )
+                rescue ::TinyTds::Error=>e
+            #Message for an incorrect password,
+                #Login failed. The login is from an untrusted domain and cannot be used with Windows authentication.
+            #Message for unavailable db
+                #Cannot open user default database. Login failed.
+                if e.message == "Cannot open user default database. Login failed." &&
+                    !failOverDataServer.nil? then
+                    hash[:dataserver] = failOverDataServer
+                    @connection = ::TinyTds::Client.new( hash )
+                else
+                    raise e
+                end
+            end
             
             if !@connection.active? then
                 raise "Unable to connect to the database"
             end
+            
         end
         
         def close

metadata

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