fluiddb2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3233bc931c69ea807e944dd613485b0f10212c
-  data.tar.gz: 3c14618c2e985e2a1e419ebffa298dd05b6afccd
+  metadata.gz: 6d7fc768792a572f2f218882388672402c9e997f
+  data.tar.gz: bd7b314edea9ee8b374d7d25d1c23b5bc4dc58c2
 SHA512:
-  metadata.gz: 96a412a1de13c85d00e0fe36ed6bcb144fff9c9a38bb8a48f7e45592793bb1da83b1f104dea45d4c743bebb2448c4cd4c3cef4ad468046cd4a83c6c03cb01dde
-  data.tar.gz: 3204ac238c68f9a31121de945ae4f5dd3070b0f10732b9deb741623e224c3f5062cbfd64e6cbe62be0be30233600590ac0fde34446275a507380c72073bad799
+  metadata.gz: 433accb089f32098956b4e96e7ada53cee25915a1dd0b84df332ba901e2c2055190bdcd8568dbb52c67cf939aa46831ca3ae806a3bb1fbb8ed86f1b5adb86065
+  data.tar.gz: 589236691d306c76597dccbe56052932d455498fc03576dbc0be440dd04cac9e515f521508054350b74e15fad6698d07cf02ee915cf6de0e193e5e5457ee95bf

data/lib/fluiddb2.rb

@@ -2,8 +2,6 @@ require 'date'
 require 'time'
 require 'uri'
 
-require 'fluiddb/db'
-
 # FluidDb2
 module FluidDb2
   class ConnectionError < StandardError

data/lib/fluiddb2/firebird.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'fb'
 include Fb
 

data/lib/fluiddb2/mock.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 
 module FluidDb2
   class SqlNotMatchedError < StandardError

data/lib/fluiddb2/mysql.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'mysql'
 
 module FluidDb2
@@ -20,31 +20,31 @@ module FluidDb2
     end
 
     def query_for_array(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql)
 
       case results.num_rows
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         r = results.fetch_hash
         return r
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_value(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql)
 
       case results.num_rows
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         r = nil
         results.each do |row|
@@ -52,17 +52,17 @@ module FluidDb2
         end
         return r[0]
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_resultset(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql)
 
       case results.num_rows
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       else
         list = []
         results.each_hash do |row|
@@ -73,7 +73,7 @@ module FluidDb2
     end
 
     def execute(sql, params = [], expected_affected_rows = nil)
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       @connection.query(sql)
 
       if !expected_affected_rows.nil? && @connection.affected_rows != expected_affected_rows

data/lib/fluiddb2/mysql2.rb

@@ -1,7 +1,8 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'mysql2'
 
 module FluidDb2
+  # Mysql2
   class Mysql2 < Base
     # Connect to Db.
     #
@@ -12,6 +13,7 @@ module FluidDb2
       @connection = ::Mysql2::Client.new(:host => uri.host,
                                          :database => uri.path.sub('/', ''),
                                          :username => uri.user,
+                                         :password => uri.password,
                                          :flags => ::Mysql2::Client::FOUND_ROWS)
     end
 
@@ -20,14 +22,14 @@ module FluidDb2
     end
 
     def query_for_array(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql)
 
       case results.count
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         r = nil
         results.each do |row|
@@ -35,19 +37,19 @@ module FluidDb2
         end
         return r
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_value(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql, :as => :array)
 
       case results.count
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         r = nil
         results.each do |row|
@@ -55,17 +57,17 @@ module FluidDb2
         end
         return r[0]
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_resultset(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       results = @connection.query(sql)
 
       case results.count
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       else
         list = []
         results.each do |row|
@@ -76,7 +78,7 @@ module FluidDb2
     end
 
     def execute(sql, params = [], expected_affected_rows = nil)
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       @connection.query(sql)
 
       if !expected_affected_rows.nil? && @connection.affected_rows != expected_affected_rows

data/lib/fluiddb2/pgsql.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'pg'
 
 module FluidDb2

data/lib/fluiddb2/sqlite.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'sqlite3'
 
 module FluidDb2
@@ -18,60 +18,60 @@ module FluidDb2
     end
 
     def query_for_array(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       @connection.results_as_hash = true
       results = @connection.execute(sql)
 
       case results.length
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         return results[0]
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_value(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       @connection.results_as_hash = false
       results = @connection.execute(sql)
 
       case results.length
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       when 0
-        fail FluidDb::NoDataFoundError
+        fail FluidDb2::NoDataFoundError
       when 1
         return results[0][0]
       else
-        fail FluidDb::TooManyRowsError
+        fail FluidDb2::TooManyRowsError
       end
     end
 
     def query_for_resultset(sql, params = [])
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
       @connection.results_as_hash = true
       results = @connection.execute(sql)
 
       case results.length
       when -1
-        fail FluidDb::ConnectionError
+        fail FluidDb2::ConnectionError
       else
         return results
       end
     end
 
     def execute(sql, params = [], expected_affected_rows = nil)
-      sql = format_to_sql(sql, params)
+      sql = FluidDb2.format_to_sql(sql, params)
 
       verbose_log "#{self.class.name}.execute. #{sql}"
       r = @connection.execute(sql)
 
-      if !expected_affected_rows.nil? && r.changes != expected_affected_rows
-        fail ExpectedAffectedRowsError, "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{r.cmd_tuples}"
+      if !expected_affected_rows.nil? && @connection.changes != expected_affected_rows
+        fail ExpectedAffectedRowsError, "Expected affected rows, #{expected_affected_rows}, Actual affected rows, #{@connection.changes}"
       end
     end
 

data/lib/fluiddb2/tiny_tds.rb

@@ -1,4 +1,4 @@
-require 'FluidDb2'
+require 'fluiddb2'
 require 'tiny_tds'
 require 'cgi'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Guy Irvine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com