fluiddb 0.0.19 → 0.0.20

data/lib/FluidDb.rb

@@ -18,7 +18,9 @@ module FluidDb
     end
     class IncorrectNumberOfParametersError<StandardError
     end
-    
+    class DuplicateKeyError<StandardError
+    end
+
     class Base
         
         attr_writer :verbose
@@ -45,7 +47,7 @@ module FluidDb
             if params.length != sql.count( "?" ) then
                 raise IncorrectNumberOfParametersError.new
             end
-            
+
             sql_out = ""
             sql.split( "?" ).each_with_index do |s,idx|
                 sql_out = sql_out + s

data/lib/FluidDb/Pgsql.rb

@@ -96,6 +96,10 @@ module FluidDb
                 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 e
         end
         
         def insert( sql, params )

data/lib/FluidDb/TinyTds.rb

@@ -7,7 +7,7 @@ module FluidDb
         
         # Connect to Db.
         #
-        # @param [String] uri a location for the resource to which we will attach, eg tinytds://user:pass@127.0.0.1
+        # @param [String] uri a location for the resource to which we will attach, eg tinytds://<user>:<pass>@<dataserver>/<database>
         def connect()
             uri = @uri
             
@@ -16,6 +16,18 @@ module FluidDb
             username = URI.unescape( uri.user )
             password = uri.password
             
+            
+            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
+                puts "*** Warning - you will normally need to specify both a username and password for the tinytds driver to work correctly."
+            end
+            
             @connection = ::TinyTds::Client.new( :username => username, :password => password, :database => database, :dataserver => dataserver )
         end
 

metadata

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