db-postgres 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 759fb2800aa247e46b47e73bca2fbd781303c98f23468df27c3d1d89c179c98a
-  data.tar.gz: d724242a698b01c258fcd021c2838e216c962f186baf09c1c8096ee0812d0028
+  metadata.gz: 7d9080559ec253dbc5e79e48cba81f8dec73e6bb9abd2f2cd5ae0cdeaf882b97
+  data.tar.gz: 8011d89fb8b19abbd805ca0068986da5763e189a7a0b046920e7d408cabdfa60
 SHA512:
-  metadata.gz: 0dc83c9e30e8d05841498abae61bedd1968d4b1b03eb1f0ceaa609403b121d441cd71c393a511fc2b78aa1710d57c45b9fcbd174bf96a89924db80d207592ea4
-  data.tar.gz: b7822ce7cf2b0fe4f969e247e702422fecb42d073487c07bd0212e98b0476275894f4dadcd8473eb4d59fbc884687f7aea8eeb035c42f6b2f78a22e08d1e8838
+  metadata.gz: 8e6e16336a47e226dcc2adaa548abd522a44af09dfe0751d09806fa991fed224dd254a34a39e2f8318da843a82936d988b27c854a2382b38f18a3e2b801c943d
+  data.tar.gz: 183c5724efcc8025409d2e6856c3934a154aa10c59b568a9e20d8ae90769fd1595b584b9a6fe5b0c8cb72759e3068f0296327a36eb7904a01590ca186d52d07c

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/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
@@ -104,15 +104,21 @@ 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+")
 					
@@ -130,11 +136,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
 			
@@ -52,6 +54,8 @@ module DB
 			attach_function :free_memory, :PQfreemem, [:pointer], :void
 			
 			class Result < FFI::Pointer
+				include Enumerable
+				
 				def initialize(connection, types = {}, address)
 					super(address)
 					
@@ -97,19 +101,11 @@ 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)
-					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.2.1"
+		VERSION = "0.4.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-04-01 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.2.3
 signing_key:
 specification_version: 4
 summary: Ruby FFI bindings for libpq C interface.