db-mariadb 0.2.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86f522a5df8d261feb1be7625f9ac23ba8768184f4103a3479a6d6acfb2638e
-  data.tar.gz: 551fe857397d0921d0f134c3701b26ff04cc4eabe1995c63128c0045350b17a2
+  metadata.gz: 86a404e12eedc21b57a6de7b9bdbd5233ec8e026f4983425482a6282850b208c
+  data.tar.gz: cfac0f1fd6b91606ddb9cf50c8bf4fc2a5cdf70ec7227f360b8f447e8cd8ba0f
 SHA512:
-  metadata.gz: 978358ac2a66906fa116fa610d3280863b16412624f7d9ece0d17f010b70dd20a399d474c6005dc87ffb5756381ac8cf8dd4733935acd4cdc0deebcad195c137
-  data.tar.gz: 4f1a7fb2d36f7c243ad7e737bb75dc79cf352284975da61a95cbbb7d644539aa9e5131fb811ce34aba5b3cd24fa195dab09c30a1b622dca62e8fba8f8061679d
+  metadata.gz: cebdcc060495de35cc9940d092cc613f598b3d512339b2589e8abdf45ab62c9e38f43c166ddeac76061ec44756dbe33b031db212c264cda2cade1e7eb9d70c28
+  data.tar.gz: 9df850b4e73f27df943c6154f21c9a870fe8c26bb88a4569ff66449e0cdb3e16f71f6e094c39463dbd0ce1ab86ecf92d6563d9ce771f6292b7c4664ac61aed27

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/adapter.rb

@@ -24,8 +24,6 @@ require_relative 'connection'
 
 module DB
 	module MariaDB
-		LOCAL = "mysql://localhost/test"
-		
 		class Adapter
 			def initialize(**options)
 				@options = options

data/lib/db/mariadb/connection.rb

@@ -27,12 +27,6 @@ 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

@@ -24,6 +24,9 @@ require_relative '../error'
 module DB
 	module MariaDB
 		module Native
+			MYSQL_PROTOCOL_TCP = 1
+			
+			MYSQL_OPT_PROTOCOL = 9
 			MYSQL_OPT_NONBLOCK = 6000
 			
 			MYSQL_WAIT_READ = 1
@@ -63,11 +66,21 @@ 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', username: 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)
 					
+					# if protocol
+					# 	Native.mysql_options(pointer, MYSQL_OPT_PROTOCOL, FFI::MemoryPointer.new(:uint, protocol))
+					# end
+					
 					client_flags |= CLIENT_MULTI_STATEMENT | CLIENT_MULTI_RESULTS
 					
 					if compression
@@ -76,11 +89,11 @@ module DB
 					
 					result = FFI::MemoryPointer.new(:pointer)
 					
-					status = Native.mysql_real_connect_start(result, pointer, host, user, password, database, port, unix_socket, client_flags);
+					status = Native.mysql_real_connect_start(result, pointer, host, username, 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.4"
+		VERSION = "0.6.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-02-15 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.