db-postgres 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84a4443e578019ea67c117e4dfc499b7d9edc78a128dde8d0d2814fbbcaceb8
-  data.tar.gz: ac6f0e2c8907fd254e46feb85c7642643b28831993726be3320ad54c49c6961f
+  metadata.gz: 759fb2800aa247e46b47e73bca2fbd781303c98f23468df27c3d1d89c179c98a
+  data.tar.gz: d724242a698b01c258fcd021c2838e216c962f186baf09c1c8096ee0812d0028
 SHA512:
-  metadata.gz: b8c5429ad14b63e14363ae2a3974db20bea363f20090aab97d14ffe9cfc83af5b04628258fbddf7da07c22762e84b987d2af315229cf267dee6950d972e32c17
-  data.tar.gz: fd56abfce51d284a682b343436e342fceb8f7811e395a18b6977fe9a01c0b85643bf3755b3a6a235b6bf75abbcc987c9731ec7513e317c8aeec9ee2221d7a2be
+  metadata.gz: 0dc83c9e30e8d05841498abae61bedd1968d4b1b03eb1f0ceaa609403b121d441cd71c393a511fc2b78aa1710d57c45b9fcbd174bf96a89924db80d207592ea4
+  data.tar.gz: b7822ce7cf2b0fe4f969e247e702422fecb42d073487c07bd0212e98b0476275894f4dadcd8473eb4d59fbc884687f7aea8eeb035c42f6b2f78a22e08d1e8838

data/lib/db/postgres/adapter.rb

@@ -24,17 +24,15 @@ require_relative 'connection'
 
 module DB
 	module Postgres
-		LOCAL = "postgres://localhost/postgres"
-		
 		class Adapter
-			def initialize(connection_string = LOCAL)
-				@connection_string = connection_string
+			def initialize(**options)
+				@options = options
 			end
 			
-			attr :connection_string
+			attr :options
 			
 			def call
-				Connection.new(self.connection_string)
+				Connection.new(**@options)
 			end
 		end
 	end

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
@@ -107,7 +114,7 @@ module DB
 					
 					pointer = Native.connect_start_params(keys, values, 0)
 					
-					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
@@ -196,6 +203,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 +225,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 +261,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 +278,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 +306,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/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module Postgres
-		VERSION = "0.1.0"
+		VERSION = "0.2.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -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
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Ruby FFI bindings for libpq C interface.