db-postgres 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5c7a476bf800ceb0e62c23d437963ef7a0a39a0eaabef48956a10af7599df7
-  data.tar.gz: eed2783a2f8b9fc31b9736a2d9cd6376c1b22af58b15a2632bbd11133e308b7d
+  metadata.gz: 2ba17d708434471a3146cf704a5df1f64109ee8d914f73e7fbd07bcee83a04d0
+  data.tar.gz: 896c9c7c8850266ec0ec93a2f3ccbf35a70edd1bf88d6e9f15b67702338d6f66
 SHA512:
-  metadata.gz: 242ac6071931166bdbd4b8a6fabedd09e5bfd01456e610b728a9582ca8dc04b3e45ef5c89dde5a6b142ad4ef3ae83fc14ebd1cc1d0d95e348e456b94125b4242
-  data.tar.gz: 409c949f727ed4ea349bb01449ef1c431c890f4c6b8ea72197a5c7cf3c792b08347d733591bd8ce941fca0d2767d94bfdac1363e0e88c0d159d177e5d7f80280
+  metadata.gz: 18d4937f8998c303c2816a9a7fc990e0b9af87fc44a25f448a48f20f509fdf6738a697eeca81df043109ebc753585565c0d67c822b350350fa69b3db9248fb82
+  data.tar.gz: cd4a0d9ea49bbee151193bc512765631c47ea99d97ae495f96d0dd91d709b216fe70840038ec410f538aeaafc3029ba63bd9df0025193dcc2622658b4bcf569d

data/lib/db/postgres/connection.rb

@@ -36,11 +36,18 @@ module DB
 			end
 			
 			def close
-				@native.close
+				if @native
+					@native&.close
+					@native = nil
+				end
 				
 				super
 			end
 			
+			def types
+				@native.types
+			end
+			
 			def append_string(value, buffer = String.new)
 				buffer << @native.escape_literal(value)
 				
@@ -49,6 +56,8 @@ module DB
 			
 			def append_literal(value, buffer = String.new)
 				case value
+				when Time, DateTime, Date
+					append_string(value.iso8601, buffer)
 				when Numeric
 					buffer << value.to_s
 				when TrueClass

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

@@ -149,6 +149,8 @@ module DB
 					@types = types
 				end
 				
+				attr :types
+				
 				# Return the status of the connection.
 				def status
 					Native.status(self)
@@ -214,7 +216,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,32 +20,60 @@
 
 require_relative 'types'
 
-require 'json'
-require 'time'
-
 module DB
 	module Postgres
 		module Native
-			# These are hard coded OIDs.
 			DEFAULT_TYPES = {
-				16 => Types::Boolean,
+				# Pseudo types:
+				primary_key: Types::Integer.new('BIGSERIAL PRIMARY KEY'),
+				foreign_key: Types::Integer.new('BIGINT'),
+				text: Types::Text.new("TEXT"),
+				string: Types::Text.new("VARCHAR(255)"),
+				
+				# Symbolic types:
+				decimal: Types::Decimal.new,
+				boolean: Types::Boolean.new,
+				
+				smallint: Types::Integer.new("SMALLINT"),
+				integer: Types::Integer.new("INTEGER"),
+				bigint: Types::Integer.new("BIGINT"),
+				
+				float: Types::Float.new,
+				double: Types::Float.new("DOUBLE"),
+				
+				timestamp: Types::DateTime.new("TIMESTAMP"),
+				date: Types::Date.new,
+				datetime: Types::DateTime.new("DATETIME"),
+				year: Types::Integer.new("LONG"),
+				
+				json: Types::JSON.new,
+				enum: Types::Symbol.new,
+				
+				# Native types:
+				# This data is extracted by hand from:
+				# <https://github.com/postgres/postgres/blob/master/src/include/catalog/pg_type.dat>.
+				# These are hard coded OIDs.
+				16 => Types::Boolean.new,
+				
+				20 => Types::Integer.new("int8"),
+				21 => Types::Integer.new("int2"),
+				23 => Types::Integer.new("int4"),
 				
-				20 => Types::Integer,
-				21 => Types::Integer,
-				23 => Types::Integer,
+				114 => Types::JSON.new,
 				
-				114 => JSON,
+				700 => Types::Float.new('float4'),
+				701 => Types::Float.new('float8'),
 				
-				700 => Types::Float,
-				701 => Types::Float,
+				1082 => Types::Date.new,
+				1083 => Types::DateTime.new("TIME"),
 				
-				1082 => Date,
-				1083 => Types::DateTime,
-				1114 => Types::DateTime,
+				1114 => Types::DateTime.new("TIMESTAMP"),
+				1184 => Types::DateTime.new("TIMESTAMPTZ"),
 				
-				1700 => Types::Decimal,
+				1700 => Types::Decimal.new,
 				
-				3500 => Types::Symbol,
+				# Not sure if this is ever used?
+				3500 => Types::Symbol.new,
 			}
 		end
 	end

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

@@ -54,8 +54,6 @@ module DB
 			ffi_attach_function :PQfreemem, [:pointer], :void, as: :free_memory
 			
 			class Result < FFI::Pointer
-				include Enumerable
-				
 				def initialize(connection, types = {}, address)
 					super(address)
 					
@@ -101,6 +99,26 @@ 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)

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

@@ -18,8 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi'
-
 require 'json'
 require 'bigdecimal'
 
@@ -27,41 +25,109 @@ module DB
 	module Postgres
 		module Native
 			module Types
-				module Boolean
-					def self.parse(string)
+				class Text
+					def initialize(name = "TEXT")
+						@name = name
+					end
+					
+					attr :name
+					
+					def parse(string)
+						string
+					end
+				end
+				
+				class Integer
+					def initialize(name = "INTEGER")
+						@name = name
+					end
+					
+					attr :name
+					
+					def parse(string)
+						Integer(string) if string
+					end
+				end
+				
+				class Boolean
+					def name
+						"BOOLEAN"
+					end
+					
+					def parse(string)
 						string == 't'
 					end
 				end
 				
-				module Integer
-					def self.parse(string)
-						Integer(string)
+				class Decimal
+					def name
+						"DECIMAL"
+					end
+					
+					def parse(string)
+						BigDecimal(string) if string
 					end
 				end
 				
-				module Decimal
-					def self.parse(string)
-						BigDecimal(string)
+				class Float
+					def initialize(name = "FLOAT")
+						@name = name
+					end
+					
+					attr :name
+					
+					def parse(string)
+						Float(string) if string
 					end
 				end
 				
-				module Float
-					def self.parse(string)
-						Float(string)
+				class Symbol
+					def name
+						"ENUM"
+					end
+					
+					def parse(string)
+						string&.to_sym
 					end
 				end
 				
-				module Symbol
-					def self.parse(string)
-						string.to_sym
+				class DateTime
+					def initialize(name = "TIMESTAMP")
+						@name = name
+					end
+					
+					attr :name
+					
+					def parse(string)
+						if string
+							parts = string.split(/[\-\s:]/)
+							
+							return Time.utc(*parts)
+						end
 					end
 				end
 				
-				module DateTime
-					def self.parse(string)
-						parts = string.split(/[\-\s:\.]/)
-						
-						return Time.utc(*parts)
+				class Date
+					def name
+						"DATE"
+					end
+					
+					def parse(string)
+						if string
+							parts = string.split(/[\-\s:]/)
+							
+							return Time.utc(*parts)
+						end
+					end
+				end
+				
+				class JSON
+					def name
+						"JSON"
+					end
+					
+					def parse(string)
+						::JSON.parse(string, symbolize_names: true) if string
 					end
 				end
 			end

data/lib/db/postgres/native.rb

@@ -35,7 +35,7 @@ module DB
 					
 					## Ubuntu
 					
-						sudo apt-get install postgresql postgresql-contrib
+						sudo apt-get install libpq-dev
 					
 					## Arch Linux
 					

data/lib/db/postgres/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module Postgres
-		VERSION = "0.5.1"
+		VERSION = "0.7.0"
 	end
 end

data.tar.gz.sig

@@ -0,0 +1,2 @@
+_��F�b��(�zM��Z
s�ƙ��.UV�"��ث*rS>���VB�ٻ��b2u0�
+p��W�6�kFF���A�

metadata

@@ -1,31 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi-module
+  name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: async-pool
+  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-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,7 +156,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
 - lib/db/postgres.rb
 - lib/db/postgres/adapter.rb
 - lib/db/postgres/connection.rb
@@ -139,7 +166,7 @@ files:
 - lib/db/postgres/native/result.rb
 - lib/db/postgres/native/types.rb
 - lib/db/postgres/version.rb
-homepage:
+homepage: https://github.com/socketry/db-postgres
 licenses:
 - MIT
 metadata: {}
@@ -158,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby FFI bindings for libpq C interface.