fluiddb 0.1.17 → 0.1.18

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d41ef8c88a11e0ece4a4eca92d8998cf387f7701
+  data.tar.gz: be7a7757cb029b40cf14e08065ef1a20597aa836
+SHA512:
+  metadata.gz: d174b047e9a60d943d8086326495ccc37f4c7df2e3aeb4f2ccf575dfdcef28bda501e4e9508a5fd2f22a854e4b770fbbabdc8f033e2a072b234c80b023199223
+  data.tar.gz: 6c2edac4d0e036c57b0cfc3719973330030792071f882360b88f664083eee3e07e80cb8b5f74bca6c98aeed9421ac6f24062404066ee96936fa4d0295ca4a580

data/lib/FluidDb/TinyTds.rb

@@ -1,11 +1,11 @@
-require "FluidDb"
-require "tiny_tds"
-require "cgi"
+require 'FluidDb'
+require 'tiny_tds'
+require 'cgi'
 
 module FluidDb
-    
+
     class TinyTds<Base
-        
+
         # Connect to Db.
         #
         # @param [String] uri a location for the resource to which we will attach, eg tinytds://<user>:<pass>@<dataserver>/<database>
@@ -13,28 +13,32 @@ module FluidDb
             uri = @uri
 
             dataserver = uri.host
-            database = uri.path.sub( "/", "" )
+            database = uri.path.sub( "/", '' )
             username = URI.unescape( uri.user )
             password = uri.password
 
-            
-            if dataserver == "" ||
-                database == "" then
+
+            if dataserver == '' ||
+                database == '' then
                 raise "*** You need to specify both a dataserver and a database for the tinytds driver. Expected format: tinytds://<user>:<pass>@<dataserver>/<database>\n" +
                 "*** The specified dataserver should have an entry in /etc/freetds/freetds.conf"
             end
-            
-            if username == "" ||
-                password == "" then
+
+            if username == '' ||
+                password == '' then
                 puts "*** Warning - you will normally need to specify both a username and password for the tinytds driver to work correctly."
             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" )
-                
+                if cgi.has_key( "host" )
+                  hash.delete(:dataserver)
+                  hash[:host] = dataserver
+                end
+
                 failOverDataServer = cgi["failoverdataserver"][0] if cgi.has_key?( "failoverdataserver" )
             end
 
@@ -53,17 +57,17 @@ module FluidDb
                     raise e
                 end
             end
-            
+
             if !@connection.active? then
                 raise "Unable to connect to the database"
             end
-            
+
         end
-        
+
         def close
             @connection.close
         end
-        
+
         def escape_string( input )
             return @connection.escape( input )
         end
@@ -71,69 +75,69 @@ module FluidDb
         def queryForArray( sql, params=[] )
             sql = self.format_to_sql( sql, params )
             results = @connection.execute(sql)
-            
+
             count = 0
-            tuple = ""
+            tuple = ''
             results.each do |row|
                 count = count + 1
                 raise FluidDb::TooManyRowsError.new if count > 1
-                
+
                 tuple = row
             end
-            
+
             raise FluidDb::NoDataFoundError.new if count == 0
-            
+
             return tuple
         end
-        
+
         def queryForValue( sql, params=[] )
             sql = self.format_to_sql( sql, params )
             results = @connection.execute(sql)
-            
+
             count = 0
-            value = ""
+            value = ''
             results.each do |row|
                 count = count + 1
                 raise FluidDb::TooManyRowsError.new if count > 1
-                
+
                 value = row[results.fields[0]]
             end
-            
+
             raise FluidDb::NoDataFoundError.new if count == 0
-            
+
             return value
         end
 
         def queryForResultset( sql, params=[] )
             sql = self.format_to_sql( sql, params )
             results = @connection.execute(sql)
-            
+
             list = Array.new
             results.each do |row|
                 list << row
             end
-            
+
             return list
         end
-        
-        
+
+
         def execute( sql, params=[], expected_affected_rows=nil )
             sql = self.format_to_sql( sql, params )
             r = @connection.execute( sql );
             r.each
-            
+
             if !expected_affected_rows.nil? and
                 r.affected_rows != expected_affected_rows then
                 raise ExpectedAffectedRowsError.new( "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.affected_rows}")
             end
         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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb
 version: !ruby/object:Gem::Version
-  version: 0.1.17
-  prerelease: 
+  version: 0.1.18
 platform: ruby
 authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com
@@ -29,27 +28,25 @@ files:
 - README.md
 homepage: http://rubygems.org/gems/fluiddb
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FluidDB
 test_files: []
-has_rdoc: