db-postgres 0.1.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15e56a0b92baec716e393ca41924d4a4aa90416821d8487bc02673142d1ed9d4
-  data.tar.gz: d4cbaa125adf5ea621cc70ae1e7161a77a9923fbcd7c48a770ca86632e578baa
+  metadata.gz: 9914774aac9e6cf060fdba11e1ce395b7311ee55c514b3720a94b8252aaf82f6
+  data.tar.gz: fa42571a59bc7c9f12103359a4e396607536a6542a5ab37bd6a736b882450792
 SHA512:
-  metadata.gz: 432dffb6cf3656f9a7e4d55654cee51bf4f7fd7453a700d7c58cf429621ebd4cc71d86a851755eceb278df8135c64e208857ab7a45647c5c32565534e85ceccd
-  data.tar.gz: 0b6d0cb0da0d93decaafbc5fa0e96f29df546f6b865edbc11e9d9290de6bddc11c0cf6e169b649e0ea2fbf2ee0909e5830eafbf8d5e5ff510d518a6cd11409df
+  metadata.gz: 9766e98f2f42277a5ffe6df30777f8f328f8d12146cce6dddfcc0e9f50a8c1359e4b2d4766377775eb996046219e188b14e7f728609da7544d338363dacc478f
+  data.tar.gz: d0a9718c070dede2a6aa61e060518c8a43d0448345a0e0c79a20ff1486f89a303cd0ef120ac9137ab13575044b3811574904056c3342ce0073ab6b532ea3754f

data/lib/db/postgres/connection.rb

@@ -27,12 +27,6 @@ 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.3"
+		VERSION = "0.2.4"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-12-25 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
@@ -114,6 +128,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/.DS_Store
 - lib/db/postgres.rb
 - lib/db/postgres/adapter.rb
 - lib/db/postgres/connection.rb
@@ -143,7 +158,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.