db-postgres 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8645e63c269d03c3503158ed9bbca82dc4d4c6fa0eb189dcdc2e1fa7d17605
-  data.tar.gz: d4e4a3ed0dc4ddc044190ac5fb0483221c97825b1f60371bd8fc5707afb24e45
+  metadata.gz: c1e8cc873554e3bcefdbf489094450d6007f0451757cf16989f812fac85d33d2
+  data.tar.gz: 91131bfb88f971578e00272aa4c410e445ed2906d051cae8105e389e35bd4423
 SHA512:
-  metadata.gz: 4aaa5eb85a4486026a845d24378c3a125edb305e5533e2dcad5d2658395c42ed6da98cc6a393b83d81bf08fb9fbd69b5a834fce41d298a20e5daf254bcc5762f
-  data.tar.gz: 87d33e1a8549824e60fcee9b7301157393f2fe8dcb1424d81c2ad707ffb2c3ec11c5fb44ffb51d82bb10e91219d1382bcfa216f1746e84f9cbda411385bf7e4e
+  metadata.gz: e81269f302f34a4243f0122e3c33146e5f5e988ea90ab19424a11c2acaaea176547b2fdaa5cc339659f2847edf95b57dda6b0fbbd6077ececd6e9bef887badb7
+  data.tar.gz: 1c5557f07a0234abbcf9609c655a63a22f5fc1178c25ed86cf8666b80fa88341ab893ffb94f6187ad38e9e9877a98bf9c09850ddff58a2d30c053c81c7051756

data/lib/db/postgres/native/connection.rb

@@ -25,16 +25,16 @@ require_relative '../error'
 module DB
 	module Postgres
 		module Native
-			def self.array_of_strings(values)
-				array = FFI::MemoryPointer.new(:pointer, values.size + 1)
-				
-				pointers = values.map do |value|
-					FFI::MemoryPointer.from_string(value.to_s)
+			class Strings
+				def initialize(values)
+					@array = FFI::MemoryPointer.new(:pointer, values.size + 1)
+					@pointers = values.map do |value|
+						FFI::MemoryPointer.from_string(value.to_s)
+					end
+					@array.write_array_of_pointer(@pointers)
 				end
 				
-				array.write_array_of_pointer(pointers)
-				
-				return array
+				attr :array
 			end
 			
 			attach_function :connect_start_params, :PQconnectStartParams, [:pointer, :pointer, :int], :pointer
@@ -103,18 +103,24 @@ module DB
 			end
 			
 			class Connection < FFI::Pointer
-				def self.connect(io: IO, types: DEFAULT_TYPES, **options)
-					# Prefer 'database' key for 'dbname' parameter:
+				def self.connect(wrapper: IO, types: DEFAULT_TYPES, **options)
+					# Postgres expects "dbname" as the key name:
 					if database = options.delete(:database)
 						options[:dbname] = database
 					end
 					
-					keys = Native.array_of_strings(options.keys)
-					values = Native.array_of_strings(options.values)
+					# Postgres expects "user" as the key name:
+					if username = options.delete(:username)
+						options[:user] = username
+					end
+					
+					keys = Strings.new(options.keys)
+					values = Strings.new(options.values)
 					
-					pointer = Native.connect_start_params(keys, values, 0)
+					pointer = Native.connect_start_params(keys.array, values.array, 0)
+					Native.set_nonblocking(pointer, 1)
 					
-					io = io.new(Native.socket(pointer), "r+")
+					io = wrapper.new(Native.socket(pointer), "r+")
 					
 					while status = Native.connect_poll(pointer)
 						break if status == :ok || status == :failed
@@ -130,11 +136,9 @@ module DB
 						
 						Native.finish(pointer)
 						
-						raise "connect: #{error_message}"
+						raise Error, "Could not connect: #{error_message}"
 					end
 					
-					Native.set_nonblocking(pointer, 1)
-					
 					return self.new(pointer, io, types)
 				end
 				

data/lib/db/postgres/native/result.rb

@@ -43,7 +43,9 @@ module DB
 			attach_function :field_count, :PQnfields, [:pointer], :int
 			attach_function :field_name, :PQfname, [:pointer, :int], :string
 			attach_function :field_type, :PQftype, [:pointer, :int], :int
+			
 			attach_function :get_value, :PQgetvalue, [:pointer, :int, :int], :string
+			attach_function :get_is_null, :PQgetisnull, [:pointer, :int, :int], :int
 			
 			attach_function :clear, :PQclear, [:pointer], :void
 			
@@ -109,7 +111,9 @@ module DB
 				
 			protected
 				def get_value(row, field)
-					Native.get_value(self, row, field)
+					if Native.get_is_null(self, row, field) == 0
+						Native.get_value(self, row, field)
+					end
 				end
 				
 				def get_row(row)

data/lib/db/postgres/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module Postgres
-		VERSION = "0.2.0"
+		VERSION = "0.3.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Ruby FFI bindings for libpq C interface.