db-postgres 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a45c4212bcf4b8c3fdf1a244292581da1a1df513450d51fcd322ea625ccd94
-  data.tar.gz: 18310b502a0cae91906948fa5ce8c5c07c07e81590612e902588abba7fdd37e1
+  metadata.gz: fd023d0017d7e3a5b859c0072e9c6073b1d2f0d33a80e2602e3b10ab3fc1774a
+  data.tar.gz: 4df334b62fb206775e8d18bc2e9431d240098b84f67a4c6c8d04e3f1ee88f24b
 SHA512:
-  metadata.gz: '039afaa56fac564fbb12e66d164ab0d0700eeb6c22d6bcbb7a56ecbd209da1b065ab16c28c5b14cac513ff0af15d7ece1f549cf4fe055db62e8f742fac4406a2'
-  data.tar.gz: 94e9caed1d36af0a15b9efb71f96a1c151c171fe062bdd789e23c0eab023a2aadd759dbbda996809d93de7fa32323e4fdc67fa52592b7a4e6a1eb784033234bb
+  metadata.gz: d473ba682e4fc823c5945d05d6265d5c31a11edbc4946de842ee2ab42f6867fc6c1cdd01130374f11e9605f6ab4655bb7ad7232cf3655925c9ee20cf3beb9a3c
+  data.tar.gz: 54c94c483f379b1b1d601c2d3ce8c86477a4a7395b73b196b1a546e166413393aa4534d28f8a77a3de3179b43f386791b4798fd4fcda170adeaf8720e9da3482

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)
@@ -76,31 +70,33 @@ module DB
 				return buffer
 			end
 			
+			def id_column(name = 'id', primary_key: true)
+				buffer = String.new
+				
+				append_identifier(name, buffer)
+				
+				buffer << " BIGSERIAL"
+				
+				if primary_key
+					buffer << " PRIMARY KEY"
+				end
+				
+				return buffer
+			end
+			
 			def status
 				@native.status
 			end
 			
 			def send_query(statement)
+				@native.discard_results
+				
 				@native.send_query(statement)
 			end
 			
 			def next_result
 				@native.next_result
 			end
-			
-			def call(statement, streaming: false)
-				@native.send_query(statement)
-				
-				@native.single_row_mode! if streaming
-				
-				last_result = nil
-				
-				while result = @native.next_result
-					last_result = result
-				end
-				
-				return last_result
-			end
 		end
 	end
 end

data/lib/db/postgres/error.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module DB
+	module Postgres
+		class Error < StandardError
+		end
+	end
+end

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

@@ -20,6 +20,7 @@
 
 require_relative 'result'
 require_relative 'field'
+require_relative '../error'
 
 module DB
 	module Postgres
@@ -95,8 +96,14 @@ 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
@@ -106,8 +113,9 @@ module DB
 					values = Native.array_of_strings(options.values)
 					
 					pointer = Native.connect_start_params(keys, values, 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
@@ -123,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
 				
@@ -196,6 +202,16 @@ module DB
 				
 				def next_result(types: @types)
 					if result = self.get_result
+						status = Native.result_status(result)
+						
+						if status == :fatal_error
+							message = Native.result_error_message(result)
+							
+							Native.clear(result)
+							
+							raise Error, "Could not get next result: #{message}"
+						end
+						
 						return Result.new(self, types, result)
 					end
 				end
@@ -208,7 +224,7 @@ module DB
 						
 						case status
 						when :copy_in
-							self.put_copy_end("discard results")
+							self.put_copy_end("Discard results")
 						when :copy_out
 							self.flush_copy_out
 						end
@@ -244,7 +260,7 @@ module DB
 						
 						if status == -1
 							message = Native.error_message(self)
-							raise Error.new(message)
+							raise Error, message
 						elsif status == 0
 							@io.wait_writable
 						else
@@ -261,7 +277,7 @@ module DB
 						
 						if status == -2
 							message = Native.error_message(self)
-							raise Error.new(message)
+							raise Error, message
 						elsif status == -1
 							break
 						elsif status == 0
@@ -289,7 +305,7 @@ module DB
 				def check!(result)
 					if result == 0
 						message = Native.error_message(self)
-						raise Error.new(message)
+						raise Error, message
 					end
 				end
 			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.1"
+		VERSION = "0.2.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -117,6 +117,7 @@ files:
 - lib/db/postgres.rb
 - lib/db/postgres/adapter.rb
 - lib/db/postgres/connection.rb
+- lib/db/postgres/error.rb
 - lib/db/postgres/native.rb
 - lib/db/postgres/native/connection.rb
 - lib/db/postgres/native/field.rb