db-postgres 0.1.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30d669b19ff5cf7b41eb45ff896363060472f2de9231c0c3a25236f23560c82
-  data.tar.gz: a3026d300addc7817bf9dbae7124f1c04140a77d8d9a6bd8854ed3741ae7af53
+  metadata.gz: 980a129963d8ce756170656f2e073d4b975f87e04e6aa569c1f1948366c589a9
+  data.tar.gz: fc22f9f7c50b5d7c10c1315dc2d23d626b0d289e4140ef0e1ffb7a2e6901a7e1
 SHA512:
-  metadata.gz: 7b0314e22e03bb2579ead32274df8015064d9799f751e02f38e5b9aee1160c92eb20ba490f502a0e39672934d7099a2445584f19cda5c42f08524648c1bda799
-  data.tar.gz: b951e9c36caed76f39f98342cae5eda8383c658eba45d2cab17cfe8aa0a0b6a73a7bbb7d3475746514b09229e68696d4690b475b89e7035d6eb662045a6e7613
+  metadata.gz: 4ba0a3ae436070fb5ab0f3f99214020673febac6ca812cbef5cdc7db4248124c1d1b33f4c1a27777ad7c7a49ded638b10bed3ddf5c5e7bb3318f943253169da3
+  data.tar.gz: b415829ef5e86f15d0a65ffcc467738d4ca8c1ea623292869636772a2c1bff686f0a9351f30392554ce560275b8d82bf5dd22d5b101d7e5ae8ecd11083db7355

data/lib/db/postgres/connection.rb

@@ -21,18 +21,12 @@
 # THE SOFTWARE.
 
 require 'async/pool/resource'
-require_relative 'native/connection'
-
 require 'async/io/generic'
 
+require_relative 'native/connection'
+
 module DB
 	module Postgres
-		module IO
-			def self.new(fd, mode)
-				Async::IO::Generic.new(::IO.new(fd, mode, autoclose: false))
-			end
-		end
-		
 		# This implements the interface between the underlying 
 		class Connection < Async::Pool::Resource
 			def initialize(**options)

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
@@ -96,19 +96,26 @@ module DB
 			attach_function :escape_literal, :PQescapeLiteral, [:pointer, :string, :size_t], :pointer
 			attach_function :escape_identifier, :PQescapeIdentifier, [:pointer, :string, :size_t], :pointer
 			
+			module IO
+				def self.new(fd, mode)
+					Async::IO::Generic.new(::IO.new(fd, mode, autoclose: false))
+				end
+			end
+			
 			class Connection < FFI::Pointer
-				def self.connect(io: IO, types: DEFAULT_TYPES, **options)
+				def self.connect(wrapper: IO, types: DEFAULT_TYPES, **options)
 					# Prefer 'database' key for 'dbname' parameter:
 					if database = options.delete(:database)
 						options[:dbname] = database
 					end
 					
-					keys = Native.array_of_strings(options.keys)
-					values = Native.array_of_strings(options.values)
+					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
@@ -124,11 +131,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.1.2"
+		VERSION = "0.2.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -114,6 +114,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/.DS_Store
 - lib/db/postgres.rb
 - lib/db/postgres/adapter.rb
 - lib/db/postgres/connection.rb