db-postgres 0.2.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd023d0017d7e3a5b859c0072e9c6073b1d2f0d33a80e2602e3b10ab3fc1774a
-  data.tar.gz: 4df334b62fb206775e8d18bc2e9431d240098b84f67a4c6c8d04e3f1ee88f24b
+  metadata.gz: edb8f8a5768d89eb1bd6a69b1590f11ed20e8b07570f34887b3a7ba4ebcb5c75
+  data.tar.gz: 3a793acd806475a5716096b2475156d733953bf3cbafec09284f808b3f70c889
 SHA512:
-  metadata.gz: d473ba682e4fc823c5945d05d6265d5c31a11edbc4946de842ee2ab42f6867fc6c1cdd01130374f11e9605f6ab4655bb7ad7232cf3655925c9ee20cf3beb9a3c
-  data.tar.gz: 54c94c483f379b1b1d601c2d3ce8c86477a4a7395b73b196b1a546e166413393aa4534d28f8a77a3de3179b43f386791b4798fd4fcda170adeaf8720e9da3482
+  metadata.gz: a55115f3c47e2b6eacf5b05799682f3e2b9b5668e289944a5c890dd644deb0a0525ea7ae8520f08a17f2df4816354d0eece6a2d47f2895789b5575b9a1d4a127
+  data.tar.gz: 962fdcf60e96b32221e77b690f99b47b40b09050d3c93545a3841188c423e77a94b510ffa520642b243357a0d0b77eb5ec3181d5e2c078f32e14ded354db83af

data/lib/db/postgres/connection.rb

@@ -65,20 +65,33 @@ module DB
 			end
 			
 			def append_identifier(value, buffer = String.new)
-				buffer << @native.escape_identifier(value)
+				case value
+				when Array
+					first = true
+					value.each do |part|
+						buffer << '.' unless first
+						first = false
+						
+						buffer << @native.escape_identifier(part)
+					end
+				else
+					buffer << @native.escape_identifier(value)
+				end
 				
 				return buffer
 			end
 			
-			def id_column(name = 'id', primary_key: true)
+			def key_column(name = 'id', primary: true, null: false)
 				buffer = String.new
 				
 				append_identifier(name, buffer)
 				
 				buffer << " BIGSERIAL"
 				
-				if primary_key
+				if primary
 					buffer << " PRIMARY KEY"
+				elsif !null
+					buffer << " NOT NULL"
 				end
 				
 				return buffer

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 postgresql postgresql-contrib
+					
+					## 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

@@ -25,35 +25,35 @@ 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
+			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)
@@ -104,15 +104,20 @@ module DB
 			
 			class Connection < FFI::Pointer
 				def self.connect(wrapper: IO, types: DEFAULT_TYPES, **options)
-					# Prefer 'database' key for 'dbname' parameter:
+					# 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 = wrapper.new(Native.socket(pointer), "r+")

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,24 +36,26 @@ 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)
 					
@@ -99,17 +101,8 @@ module DB
 					Native.clear(self)
 				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/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module Postgres
-		VERSION = "0.2.2"
+		VERSION = "0.5.0"
 	end
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-04-04 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.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby FFI bindings for libpq C interface.