db-mariadb 0.2.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fabe415cca5af184bf390ff1b5b1425969de2dbe25e737300a34db551af7a58
-  data.tar.gz: 5c5bcf025c974053073f14b370855250dfe18d47e08c69443fe94f01f5f3ae1f
+  metadata.gz: '035816431be310fe0576e3484d8567531a899ac9b5bde00ef6eae5f40d835c10'
+  data.tar.gz: 26e1ab9017bb812343fc61e98d2d23c1f197e4b7a5bcea97b2809a61df61bd6d
 SHA512:
-  metadata.gz: eb6e3130b2001f143f945d6e8bcd0be8b2bf3688806b5564ef194567afc9a60c55ac6f40266df309876cbe96e832801a007d55eab016a44cd821c8807d371993
-  data.tar.gz: 0fcf3a49347d074bda9d59479dea8dc59661e3b0ad5661cc1326a2dc6f4c25cc28d0d6a262a3221c19bb1416844b0ce3465ef70a1c56050f7d2318bfdac967ec
+  metadata.gz: 6d858c2bd63c590f05b12df2ee6f5fba4551c77fd668143a42d548a1d52ec6d5725fa4d94e9df235266d73996f8b31d5a4cd4bb1451cd59c1544e38825337ac6
+  data.tar.gz: 9becfe75e0c743be9c765904eaabf2f52b757d6532db7a04a7381414c4532496233c7dcf398ca23d681494b4f61258dc6db5653b6459b88f617582d0abe47e47

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)
 					
@@ -78,9 +84,9 @@ module DB
 					
 					status = Native.mysql_real_connect_start(result, pointer, host, user, password, database, port, unix_socket, client_flags);
 					
+					io = wrapper.new(Native.mysql_get_socket(pointer), "r+")
+					
 					if status > 0
-						io = IO.new(Native.mysql_get_socket(pointer), "r+")
-						
 						while status > 0
 							if status & MYSQL_WAIT_READ
 								io.wait_readable

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

@@ -22,6 +22,9 @@ require_relative '../native'
 
 require_relative 'types'
 
+require 'date'
+require 'json'
+
 module DB
 	module MariaDB
 		module Native

data/lib/db/mariadb/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module MariaDB
-		VERSION = "0.2.3"
+		VERSION = "0.5.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.5.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
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: An event-driven interface for MariaDB and MySQL servers.