db-postgres 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9080559ec253dbc5e79e48cba81f8dec73e6bb9abd2f2cd5ae0cdeaf882b97
-  data.tar.gz: 8011d89fb8b19abbd805ca0068986da5763e189a7a0b046920e7d408cabdfa60
+  metadata.gz: 1f6e34604ab35a726644bb1783228a2d60f01f76b0d431110ae20c5974ec3fcb
+  data.tar.gz: e879e050b47d3975a29bc6b67e59b5837ad8b8cf067d96554eaf951a8d04198a
 SHA512:
-  metadata.gz: 8e6e16336a47e226dcc2adaa548abd522a44af09dfe0751d09806fa991fed224dd254a34a39e2f8318da843a82936d988b27c854a2382b38f18a3e2b801c943d
-  data.tar.gz: 183c5724efcc8025409d2e6856c3934a154aa10c59b568a9e20d8ae90769fd1595b584b9a6fe5b0c8cb72759e3068f0296327a36eb7904a01590ca186d52d07c
+  metadata.gz: 7f4842d9d1c6c3e70029b9a4df1fd4e27a2a10bb4920465dddb1f25616b01ef50c67029d1666c218af68521bb9803cba5bc9b9f478e0c409c7c376e31466af92
+  data.tar.gz: d9a04d2d4a541f44bc51493cb0509c0a2a0ad8e39a24e0803fa2e61532ab85cbbbe3c48045c01d60c76b9be88b464797626d966bfbe884dcdd2736c03ba7ee4e

data/lib/db/postgres/connection.rb

@@ -86,7 +86,11 @@ module DB
 				
 				append_identifier(name, buffer)
 				
-				buffer << " BIGSERIAL"
+				if primary
+					buffer << " BIGSERIAL"
+				else
+					buffer << " BIGINT"
+				end
 				
 				if primary
 					buffer << " PRIMARY KEY"

data/lib/db/postgres/native.rb

@@ -18,14 +18,38 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi'
+require 'ffi/module'
+require 'ffi/module/config_tool'
 
 module DB
 	module Postgres
 		module Native
-			extend FFI::Library
+			extend FFI::Module::Library
+			extend FFI::Module::Loader
+			extend FFI::Module::ConfigTool
 			
-			ffi_lib 'pq'
+			ffi_load('pq') ||
+				ffi_load_using_config_tool(%w{pg_config --libdir}, names: ['pq']) ||
+				ffi_load_failure(<<~EOF)
+					Unable to load libpq!
+					
+					## Ubuntu
+					
+						sudo apt-get install libpq-dev
+					
+					## Arch Linux
+					
+						sudo pacman -S postgresql
+					
+					## MacPorts
+					
+						sudo port install postgresql11
+					
+					## Homebrew
+					
+						brew install postgresql
+					
+				EOF
 		end
 	end
 end

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

@@ -37,23 +37,23 @@ module DB
 				attr :array
 			end
 			
-			attach_function :connect_start_params, :PQconnectStartParams, [:pointer, :pointer, :int], :pointer
+			ffi_attach_function :PQconnectStartParams, [:pointer, :pointer, :int], :pointer, as: :connect_start_params
 			
-			enum :polling_status, [
+			ffi_define_enumeration :polling_status, [
 				:failed,
 				:wait_readable,
 				:wait_writable,
 				:ok,
 			]
 			
-			attach_function :connect_poll, :PQconnectPoll, [:pointer], :polling_status
+			ffi_attach_function :PQconnectPoll, [:pointer], :polling_status, as: :connect_poll
 			
 			# Close the connection and release underlying resources.
-			attach_function :finish, :PQfinish, [:pointer], :void
+			ffi_attach_function :PQfinish, [:pointer], :void, as: :finish
 			
-			attach_function :error_message, :PQerrorMessage, [:pointer], :string
+			ffi_attach_function :PQerrorMessage, [:pointer], :string, as: :error_message
 			
-			enum :status, [
+			ffi_define_enumeration :status, [
 				# Normal mode:
 				:ok,
 				:bad,
@@ -70,31 +70,31 @@ module DB
 				:consume, # Wait for any pending message and consume them.
 			]
 			
-			attach_function :status, :PQstatus, [:pointer], :status
+			ffi_attach_function :PQstatus, [:pointer], :status, as: :status
 			
-			attach_function :socket, :PQsocket, [:pointer], :int
+			ffi_attach_function :PQsocket, [:pointer], :int, as: :socket
 			
-			attach_function :set_nonblocking, :PQsetnonblocking, [:pointer, :int], :int
-			attach_function :flush, :PQflush, [:pointer], :int
+			ffi_attach_function :PQsetnonblocking, [:pointer, :int], :int, as: :set_nonblocking
+			ffi_attach_function :PQflush, [:pointer], :int, as: :flush
 			
 			# Submits a command to the server without waiting for the result(s). 1 is returned if the command was successfully dispatched and 0 if not (in which case, use PQerrorMessage to get more information about the failure).
-			attach_function :send_query, :PQsendQuery, [:pointer, :string], :int
+			ffi_attach_function :PQsendQuery, [:pointer, :string], :int, as: :send_query
 			
 			# int PQsendQueryParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, const char * const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat);
-			attach_function :send_query_params, :PQsendQueryParams, [:pointer, :string, :int, :pointer, :pointer, :pointer, :pointer, :int], :int
+			ffi_attach_function :PQsendQueryParams, [:pointer, :string, :int, :pointer, :pointer, :pointer, :pointer, :int], :int, as: :send_query_params
 			
-			attach_function :set_single_row_mode, :PQsetSingleRowMode, [:pointer], :int
+			ffi_attach_function :PQsetSingleRowMode, [:pointer], :int, as: :set_single_row_mode
 			
-			attach_function :get_result, :PQgetResult, [:pointer], :pointer
+			ffi_attach_function :PQgetResult, [:pointer], :pointer, as: :get_result
 			
 			# If input is available from the server, consume it:
-			attach_function :consume_input, :PQconsumeInput, [:pointer], :int
+			ffi_attach_function :PQconsumeInput, [:pointer], :int, as: :consume_input
 			
 			# Returns 1 if a command is busy, that is, PQgetResult would block waiting for input. A 0 return indicates that PQgetResult can be called with assurance of not blocking.
-			attach_function :is_busy, :PQisBusy, [:pointer], :int
+			ffi_attach_function :PQisBusy, [:pointer], :int, as: :is_busy
 			
-			attach_function :escape_literal, :PQescapeLiteral, [:pointer, :string, :size_t], :pointer
-			attach_function :escape_identifier, :PQescapeIdentifier, [:pointer, :string, :size_t], :pointer
+			ffi_attach_function :PQescapeLiteral, [:pointer, :string, :size_t], :pointer, as: :escape_literal
+			ffi_attach_function :PQescapeIdentifier, [:pointer, :string, :size_t], :pointer, as: :escape_identifier
 			
 			module IO
 				def self.new(fd, mode)
@@ -214,7 +214,7 @@ module DB
 							
 							Native.clear(result)
 							
-							raise Error, "Could not get next result: #{message}"
+							raise Error, message
 						end
 						
 						return Result.new(self, types, result)

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

@@ -20,9 +20,6 @@
 
 require_relative 'types'
 
-require 'json'
-require 'time'
-
 module DB
 	module Postgres
 		module Native
@@ -34,7 +31,7 @@ module DB
 				21 => Types::Integer,
 				23 => Types::Integer,
 				
-				114 => JSON,
+				114 => Types::JSON,
 				
 				700 => Types::Float,
 				701 => Types::Float,

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

@@ -23,7 +23,7 @@ require_relative '../native'
 module DB
 	module Postgres
 		module Native
-			enum :query_status, [
+			ffi_define_enumeration :query_status, [
 				:empty_query, # empty query string was executed
 				:command_ok, # a query command that doesn't return anything was executed properly by the backend
 				:tuples_ok, #  a query command that returns tuples was executed properly by the backend, PGresult contains the result tuples
@@ -36,26 +36,24 @@ module DB
 				:single_tuple, # single tuple from larger resultset
 			]
 			
-			attach_function :result_status, :PQresultStatus, [:pointer], :query_status
-			attach_function :result_error_message, :PQresultErrorMessage, [:pointer], :string
+			ffi_attach_function :PQresultStatus, [:pointer], :query_status, as: :result_status
+			ffi_attach_function :PQresultErrorMessage, [:pointer], :string, as: :result_error_message
 			
-			attach_function :row_count, :PQntuples, [:pointer], :int
-			attach_function :field_count, :PQnfields, [:pointer], :int
-			attach_function :field_name, :PQfname, [:pointer, :int], :string
-			attach_function :field_type, :PQftype, [:pointer, :int], :int
+			ffi_attach_function :PQntuples, [:pointer], :int, as: :row_count
+			ffi_attach_function :PQnfields, [:pointer], :int, as: :field_count
+			ffi_attach_function :PQfname, [:pointer, :int], :string, as: :field_name
+			ffi_attach_function :PQftype, [:pointer, :int], :int, as: :field_type
 			
-			attach_function :get_value, :PQgetvalue, [:pointer, :int, :int], :string
-			attach_function :get_is_null, :PQgetisnull, [:pointer, :int, :int], :int
+			ffi_attach_function :PQgetvalue, [:pointer, :int, :int], :string, as: :get_value
+			ffi_attach_function :PQgetisnull, [:pointer, :int, :int], :int, as: :get_is_null
 			
-			attach_function :clear, :PQclear, [:pointer], :void
+			ffi_attach_function :PQclear, [:pointer], :void, as: :clear
 			
-			attach_function :put_copy_end, :PQputCopyEnd, [:pointer, :string], :int
-			attach_function :get_copy_data, :PQgetCopyData, [:pointer, :pointer, :int], :int
-			attach_function :free_memory, :PQfreemem, [:pointer], :void
+			ffi_attach_function :PQputCopyEnd, [:pointer, :string], :int, as: :put_copy_end
+			ffi_attach_function :PQgetCopyData, [:pointer, :pointer, :int], :int, as: :get_copy_data
+			ffi_attach_function :PQfreemem, [:pointer], :void, as: :free_memory
 			
 			class Result < FFI::Pointer
-				include Enumerable
-				
 				def initialize(connection, types = {}, address)
 					super(address)
 					
@@ -101,7 +99,28 @@ module DB
 					Native.clear(self)
 				end
 				
+				def map(&block)
+					results = []
+					
+					self.each do |row|
+						results << yield(row)
+					end
+					
+					return results
+				end
+				
+				def to_a
+					rows = []
+					
+					self.each do |row|
+						rows << row
+					end
+					
+					return rows
+				end
+				
 			protected
+				
 				def get_value(row, field)
 					if Native.get_is_null(self, row, field) == 0
 						Native.get_value(self, row, field)

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

@@ -22,6 +22,7 @@ require 'ffi'
 
 require 'json'
 require 'bigdecimal'
+require 'time'
 
 module DB
 	module Postgres
@@ -35,33 +36,41 @@ module DB
 				
 				module Integer
 					def self.parse(string)
-						Integer(string)
+						Integer(string) if string
 					end
 				end
 				
 				module Decimal
 					def self.parse(string)
-						BigDecimal(string)
+						BigDecimal(string) if string
 					end
 				end
 				
 				module Float
 					def self.parse(string)
-						Float(string)
+						Float(string) if string
 					end
 				end
 				
 				module Symbol
 					def self.parse(string)
-						string.to_sym
+						string&.to_sym
 					end
 				end
 				
 				module DateTime
 					def self.parse(string)
-						parts = string.split(/[\-\s:\.]/)
-						
-						return Time.utc(*parts)
+						if string
+							parts = string.split(/[\-\s:\.]/)
+							
+							return Time.utc(*parts)
+						end
+					end
+				end
+				
+				module JSON
+					def self.parse(string)
+						::JSON.parse(string, symbolize_names: true) if string
 					end
 				end
 			end

data/lib/db/postgres/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module Postgres
-		VERSION = "0.4.0"
+		VERSION = "0.6.0"
 	end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: ffi-module
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement