db-mariadb 0.1.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48fc978d5a9616b176cfd22ebaac97ef4aa64ef46e8741c4842f3ac22bffd0f
-  data.tar.gz: '0349fcd36f4b9a4fa36c4c75fca6a3d780b02056dc418a941118533b60ffe16b'
+  metadata.gz: a86f522a5df8d261feb1be7625f9ac23ba8768184f4103a3479a6d6acfb2638e
+  data.tar.gz: 551fe857397d0921d0f134c3701b26ff04cc4eabe1995c63128c0045350b17a2
 SHA512:
-  metadata.gz: 950fed54c6d1eb1c71c4f81657b49ee82aa0b2fed6f2598d62757064522db8b94dd8a80bc38131ffbdc12d950334e46e6258242876d261cd1bb263c3da4ea36a
-  data.tar.gz: e4d6eaca7a2ce5b095301f8af3d34b84e20594db296e7f2842e12886cf5faecf5dfe3ffbef6ddb6ac247f8cf7478437aa182fe2da6abfa7e883658ca9619f71c
+  metadata.gz: 978358ac2a66906fa116fa610d3280863b16412624f7d9ece0d17f010b70dd20a399d474c6005dc87ffb5756381ac8cf8dd4733935acd4cdc0deebcad195c137
+  data.tar.gz: 4f1a7fb2d36f7c243ad7e737bb75dc79cf352284975da61a95cbbb7d644539aa9e5131fb811ce34aba5b3cd24fa195dab09c30a1b622dca62e8fba8f8061679d

data/lib/db/mariadb/adapter.rb

@@ -27,14 +27,14 @@ module DB
 		LOCAL = "mysql://localhost/test"
 		
 		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/mariadb/connection.rb

@@ -21,10 +21,18 @@
 # 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)
@@ -49,8 +57,12 @@ module DB
 				case value
 				when Numeric
 					buffer << value.to_s
+				when TrueClass
+					buffer << 'TRUE'
+				when FalseClass
+					buffer << 'FALSE'
 				when nil
-					buffer << "NULL"
+					buffer << 'NULL'
 				else
 					append_string(value, buffer)
 				end
@@ -64,11 +76,27 @@ 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
 			

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,14 +63,8 @@ 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(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(io: 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)
 					
@@ -100,13 +95,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: types, **options)
+					return self.new(pointer, io, types, **options)
 				end
 				
-				def initialize(address, io, types: {})
+				def initialize(address, io, types, **options)
 					super(address)
 					
 					@io = io
@@ -125,7 +120,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
 				
@@ -174,42 +169,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.1.0"
+		VERSION = "0.2.4"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -114,10 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/.DS_Store
 - 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
@@ -143,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.