db-mariadb 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f27b7da8ad5cdec94cfd6b7ae6f078b30886231c62f49489892e2d41c1c9d96
-  data.tar.gz: a194fe786b2ce7fe4a22c276e5b38a47d52a965321747604e7a502f62bcaa5f9
+  metadata.gz: 5a5fec76a4d531cdcad6ea1d54e10b6a251895a47207d74acec924a02edc3da5
+  data.tar.gz: a9890c37d02dc2e0493eee2d7af4f89f05de994464c99435eb10ff43bea13ef7
 SHA512:
-  metadata.gz: 9ec2fb9d0d2c6d2fa0c5720297ea55a18a68da966bf7f0216bdf103260764b54ab8f88b5f3b301820c833348969eb14a37a93873fe3ba68c5106579006c79919
-  data.tar.gz: ac9e5b54a6013203dba3fef1fa70ff2f0969753ff73c397948ccad2f41c4cad114a278068b5e0a8fc5eda7a2e75713d30a83cc7ee602dde78e4faf2efb6c0eb8
+  metadata.gz: 1f5aa5144c1194868398e71eaab0dd42361d2c2b8674e41d0f1dda22f2c2f73367f2eda61eca900e8bca5deb5b5a810848db6816a2343217bf0b45be720557a8
+  data.tar.gz: a7a18fa736f1766dbbc0b38b01b71c15c6b844a5b8212063f85c6517db942588c63b92b036e9b229326cf55d2c99cde5c179592496149a05d3210824a0d5d9e3

data/lib/db/mariadb.rb

@@ -24,4 +24,4 @@ require_relative 'mariadb/connection'
 require_relative 'mariadb/adapter'
 
 require 'db/adapters'
-DB::Adapters.register(:mysql, DB::MariaDB::Adapter)
+DB::Adapters.register(:mariadb, DB::MariaDB::Adapter)

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)

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
@@ -63,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)
 					
@@ -79,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
@@ -101,7 +107,7 @@ module DB
 					return self.new(pointer, io, types, **options)
 				end
 				
-				def initialize(address, io, types)
+				def initialize(address, io, types, **options)
 					super(address)
 					
 					@io = io

data/lib/db/mariadb/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module MariaDB
-		VERSION = "0.2.2"
+		VERSION = "0.4.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi