db-mariadb 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b625dc4c4f14093794812d057af4aced8ca7ed30f65e5b0c6b8a0b29a6262f1
-  data.tar.gz: e42b0449b3609e63df290e7ff75a6c1b7319ff136641483a4428f5b6a9df0d2d
+  metadata.gz: 3b1fb0496909a9d442eefe8576721a57eb4affee9693f9bb7c69d682546d74b2
+  data.tar.gz: a98067cc177c1ee492769caa3ffcae13453f913e240a71a92b71a562ed9c778c
 SHA512:
-  metadata.gz: a9bc494987c948c66a7898c404701ca2a002ae9838d4af632d638fbcde44691fd83270a6a86ec7579c52e224e1d42ebf985bbca669ad7eb4295f2f622ccf3d60
-  data.tar.gz: fe00875308c4d7bd14eb4966c4bb86ad1ddb7aa48e5e82e888adc0b4a93c9ece55b0328ec9e18f9ef015ac5406346f3f0e2e648e7ad3c586026757346f19448a
+  metadata.gz: 4f3fd799d28712eea7ca8e27471c515dfd18925e11204883a601f7f4a91b831477bbda99a696f50d84cc921487b0531b44771dc0cc45deb876dbefc2adf8bd4f
+  data.tar.gz: 36b0ea16a2b0a2249a9f731e6ddb5de6999d21f691cd1a02e764ca7ca049a1aaccbdac316cc484546e6f79ce5111ab30862bdae666ed1fbb3afe786b049060ce

data/lib/db/mariadb/connection.rb

@@ -21,16 +21,12 @@
 # THE SOFTWARE.
 
 require 'async/pool/resource'
+require 'async/io/generic'
+
 require_relative 'native/connection'
 
 module DB
 	module MariaDB
-		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 underyling native interface interface and "standardised" connection interface.
 		class Connection < Async::Pool::Resource
 			def initialize(**options)
@@ -74,29 +70,33 @@ module DB
 				return buffer
 			end
 			
+			def id_column(name = 'id', primary_key: true)
+				buffer = String.new
+				
+				append_identifier(name, buffer)
+				
+				buffer << " BIGINT AUTO_INCREMENT"
+				
+				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)
-				
-				last_result = nil
-				
-				while result = @native.next_result
-					last_result = result
-				end
-				
-				return last_result
-			end
 		end
 	end
 end

data/lib/db/mariadb/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 MariaDB
+		class Error < StandardError
+		end
+	end
+end

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

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'result'
-require 'async/io/generic'
+require_relative '../error'
 
 module DB
 	module MariaDB
@@ -48,6 +48,7 @@ module DB
 			
 			attach_function :mysql_use_result, [:pointer], :pointer
 			attach_function :mysql_next_result, [:pointer], :int
+			attach_function :mysql_more_results, [:pointer], :int
 			attach_function :mysql_free_result, [:pointer], :void
 			
 			attach_function :mysql_affected_rows, [:pointer], :uint64
@@ -62,8 +63,14 @@ module DB
 			
 			attach_function :mysql_real_escape_string, [:pointer, :pointer, :string, :size_t], :size_t
 			
+			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, host: 'localhost', user: nil, password: nil, database: nil, port: 0, unix_socket: nil, client_flags: 0, compression: false, types: DEFAULT_TYPES, **options)
+				def self.connect(wrapper: IO, host: 'localhost', user: nil, password: nil, database: nil, port: 0, unix_socket: nil, client_flags: 0, compression: false, types: DEFAULT_TYPES, **options)
 					pointer = Native.mysql_init(nil)
 					Native.mysql_options(pointer, MYSQL_OPT_NONBLOCK, nil)
 					
@@ -78,7 +85,7 @@ module DB
 					status = Native.mysql_real_connect_start(result, pointer, host, user, password, database, port, unix_socket, client_flags);
 					
 					if status > 0
-						io = IO.new(Native.mysql_get_socket(pointer), "r+")
+						io = wrapper.new(Native.mysql_get_socket(pointer), "r+")
 						
 						while status > 0
 							if status & MYSQL_WAIT_READ
@@ -94,13 +101,13 @@ module DB
 					end
 					
 					if result.read_pointer.null?
-						raise "Could not connect: #{Native.mysql_error(pointer)}!"
+						raise Error, "Could not connect: #{Native.mysql_error(pointer)}!"
 					end
 					
 					return self.new(pointer, io, types, **options)
 				end
 				
-				def initialize(address, io, types)
+				def initialize(address, io, types, **options)
 					super(address)
 					
 					@io = io
@@ -119,7 +126,7 @@ module DB
 				
 				def check_error!(message)
 					if Native.mysql_errno(self) != 0
-						raise "#{message}: #{Native.mysql_error(self)}!"
+						raise Error, "#{message}: #{Native.mysql_error(self)}!"
 					end
 				end
 				
@@ -168,42 +175,62 @@ module DB
 					end
 					
 					if error.read_int != 0
-						raise "Could not send query: #{Native.mysql_error(self)}!"
+						raise Error, "Could not send query: #{Native.mysql_error(self)}!"
 					end
 				end
 				
+				# @returns [Boolean] If there are more results.
+				def more_results?
+					Native.mysql_more_results(self) == 1
+				end
+				
 				def next_result(types: @types)
+					if result = self.get_result
+						return Result.new(self, types, result)
+					end
+				end
+				
+				# Silently discard any results that application didn't read.
+				def discard_results
+					while result = self.get_result
+					end
+					
+					return nil
+				end
+				
+				def affected_rows
+					Native.mysql_affected_rows(self)
+				end
+				
+				def insert_id
+					Native.mysql_insert_id(self)
+				end
+				
+				def info
+					Native.mysql_info(self)
+				end
+				
+			protected
+				def get_result
 					if @result
 						self.free_result
 						
 						# Successful and there are no more results:
 						return if Native.mysql_next_result(self) == -1
 						
-						check_error!("Next result")
+						check_error!("Get result")
 					end
 					
 					@result = Native.mysql_use_result(self)
 					
 					if @result.null?
-						check_error!("Next result")
+						check_error!("Get result")
 						
 						return nil
 					else
-						return Result.new(self, types, @result)
+						return @result
 					end
 				end
-				
-				def affected_rows
-					Native.mysql_affected_rows(self)
-				end
-				
-				def insert_id
-					Native.mysql_insert_id(self)
-				end
-				
-				def info
-					Native.mysql_info(self)
-				end
 			end
 		end
 	end

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

@@ -25,7 +25,7 @@ require_relative 'types'
 module DB
 	module MariaDB
 		module Native
-			Type = enum(FFI::Type::UCHAR,
+			Type = enum(
 				:decimal,
 				:tiny,
 				:short,
@@ -98,7 +98,8 @@ module DB
 					:flags, :uint,
 					:decimals, :uint,
 					:charsetnr, :uint,
-					:type, Type
+					:type, Type,
+					:extension, :pointer,
 				)
 				
 				def name

data/lib/db/mariadb/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module MariaDB
-		VERSION = "0.2.1"
+		VERSION = "0.3.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -117,6 +117,7 @@ files:
 - lib/db/mariadb.rb
 - lib/db/mariadb/adapter.rb
 - lib/db/mariadb/connection.rb
+- lib/db/mariadb/error.rb
 - lib/db/mariadb/native.rb
 - lib/db/mariadb/native/connection.rb
 - lib/db/mariadb/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: An event-driven interface for MariaDB and MySQL servers.