db-mariadb 0.5.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '035816431be310fe0576e3484d8567531a899ac9b5bde00ef6eae5f40d835c10'
-  data.tar.gz: 26e1ab9017bb812343fc61e98d2d23c1f197e4b7a5bcea97b2809a61df61bd6d
+  metadata.gz: da745fa5ee09cf5597517b05fed1addde79acd2806e7100478fc53c9bb17cb0a
+  data.tar.gz: af66b7b339684d530a30c698554c8bf44c3db0190bf2d65c947d7fa2ba012cda
 SHA512:
-  metadata.gz: 6d858c2bd63c590f05b12df2ee6f5fba4551c77fd668143a42d548a1d52ec6d5725fa4d94e9df235266d73996f8b31d5a4cd4bb1451cd59c1544e38825337ac6
-  data.tar.gz: 9becfe75e0c743be9c765904eaabf2f52b757d6532db7a04a7381414c4532496233c7dcf398ca23d681494b4f61258dc6db5653b6459b88f617582d0abe47e47
+  metadata.gz: 28697c26a2fa1336a7902510fcf89815b1b8092ce9e109ba376321ea4ab12c66e19ef6c5bf9490a57259bc0452c3e9c70bebef62a8694f8e76388a793b6eb9c8
+  data.tar.gz: de7b57100c80451e8192a7b0b4f59635fa2b7ee0ecac8c305c08be4cbb1fe0fc3f920d3d68d6d695856855759377175790760e75145fa22a7316b45991c26802

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

@@ -65,20 +65,33 @@ module DB
 			end
 			
 			def append_identifier(value, buffer = String.new)
-				buffer << "`" << @native.escape(value) << "`"
+				case value
+				when Array
+					first = true
+					value.each do |part|
+						buffer << '.' unless first
+						first = false
+						
+						buffer << escape_identifier(part)
+					end
+				else
+					buffer << escape_identifier(value)
+				end
 				
 				return buffer
 			end
 			
-			def id_column(name = 'id', primary_key: true)
+			def key_column(name = 'id', primary: true, null: false)
 				buffer = String.new
 				
 				append_identifier(name, buffer)
 				
-				buffer << " BIGINT AUTO_INCREMENT"
+				buffer << " BIGINT"
 				
-				if primary_key
-					buffer << " PRIMARY KEY"
+				if primary
+					buffer << " AUTO_INCREMENT PRIMARY KEY"
+				elsif !null
+					buffer << " NOT NULL"
 				end
 				
 				return buffer
@@ -97,6 +110,12 @@ module DB
 			def next_result
 				@native.next_result
 			end
+			
+			protected
+			
+			def escape_identifier(value)
+				"`#{@native.escape(value)}`"
+			end
 		end
 	end
 end

data/lib/db/mariadb/native.rb

@@ -18,14 +18,40 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi'
+require 'ffi/module'
+require 'ffi/module/config_tool'
 
 module DB
 	module MariaDB
 		module Native
-			extend FFI::Library
+			extend FFI::Module::Library
+			extend FFI::Module::Loader
+			extend FFI::Module::ConfigTool
 			
-			ffi_lib 'mariadb'
+			ffi_load('mariadb') ||
+				ffi_load_using_config_tool(%w{mariadb_config --libs}) ||
+				ffi_load_using_config_tool(%w{mysql_config --libs}) ||
+				ffi_load_failure(<<~EOF)
+					Unable to load libmariadb!
+					
+					## Ubuntu
+					
+						sudo apt-get install libmariadb-dev
+					
+					## Arch Linux
+					
+						sudo pacman -S mariadb
+					
+					## MacPorts
+					
+						sudo port install mariadb-10.5
+						sudo port select --set mysql mariadb-10.5
+					
+					## Homebrew
+					
+						brew install mariadb
+					
+				EOF
 		end
 	end
 end

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
@@ -36,32 +39,32 @@ module DB
 			CLIENT_MULTI_STATEMENT = 0x00010000
 			CLIENT_MULTI_RESULTS = 0x00020000
 			
-			attach_function :mysql_init, [:pointer], :pointer
-			attach_function :mysql_options, [:pointer, :int, :pointer], :int
-			attach_function :mysql_get_socket, [:pointer], :int
+			ffi_attach_function :mysql_init, [:pointer], :pointer
+			ffi_attach_function :mysql_options, [:pointer, :int, :pointer], :int
+			ffi_attach_function :mysql_get_socket, [:pointer], :int
 			
-			attach_function :mysql_real_connect_start, [:pointer, :pointer, :string, :string, :string, :string, :int, :string, :long], :int
-			attach_function :mysql_real_connect_cont, [:pointer, :pointer, :int], :int
+			ffi_attach_function :mysql_real_connect_start, [:pointer, :pointer, :string, :string, :string, :string, :int, :string, :long], :int
+			ffi_attach_function :mysql_real_connect_cont, [:pointer, :pointer, :int], :int
 			
-			attach_function :mysql_real_query_start, [:pointer, :pointer, :string, :ulong], :int
-			attach_function :mysql_real_query_cont, [:pointer, :pointer, :int], :int
+			ffi_attach_function :mysql_real_query_start, [:pointer, :pointer, :string, :ulong], :int
+			ffi_attach_function :mysql_real_query_cont, [:pointer, :pointer, :int], :int
 			
-			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
+			ffi_attach_function :mysql_use_result, [:pointer], :pointer
+			ffi_attach_function :mysql_next_result, [:pointer], :int
+			ffi_attach_function :mysql_more_results, [:pointer], :int
+			ffi_attach_function :mysql_free_result, [:pointer], :void
 			
-			attach_function :mysql_affected_rows, [:pointer], :uint64
-			attach_function :mysql_insert_id, [:pointer], :uint64
-			attach_function :mysql_info, [:pointer], :string
+			ffi_attach_function :mysql_affected_rows, [:pointer], :uint64
+			ffi_attach_function :mysql_insert_id, [:pointer], :uint64
+			ffi_attach_function :mysql_info, [:pointer], :string
 			
-			attach_function :mysql_close, [:pointer], :void
-			attach_function :mysql_errno, [:pointer], :uint
-			attach_function :mysql_error, [:pointer], :string
+			ffi_attach_function :mysql_close, [:pointer], :void
+			ffi_attach_function :mysql_errno, [:pointer], :uint
+			ffi_attach_function :mysql_error, [:pointer], :string
 			
-			attach_function :mysql_stat, [:pointer], :string
+			ffi_attach_function :mysql_stat, [:pointer], :string
 			
-			attach_function :mysql_real_escape_string, [:pointer, :pointer, :string, :size_t], :size_t
+			ffi_attach_function :mysql_real_escape_string, [:pointer, :pointer, :string, :size_t], :size_t
 			
 			module IO
 				def self.new(fd, mode)
@@ -70,10 +73,14 @@ module DB
 			end
 			
 			class Connection < FFI::Pointer
-				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)
+				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
@@ -82,7 +89,7 @@ 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+")
 					

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

@@ -28,7 +28,7 @@ require 'json'
 module DB
 	module MariaDB
 		module Native
-			Type = enum(
+			Type = ffi_define_enumeration(:field_type, [
 				:decimal,
 				:tiny,
 				:short,
@@ -57,7 +57,7 @@ module DB
 				:var_string,
 				:string,
 				:geometry,
-			)
+			])
 			
 			DEFAULT_TYPES = {
 				decimal: Types::Decimal,

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

@@ -23,13 +23,13 @@ require_relative 'field'
 module DB
 	module MariaDB
 		module Native
-			attach_function :mysql_fetch_row_start, [:pointer, :pointer], :int
-			attach_function :mysql_fetch_row_cont, [:pointer, :pointer, :int], :int
+			ffi_attach_function :mysql_fetch_row_start, [:pointer, :pointer], :int
+			ffi_attach_function :mysql_fetch_row_cont, [:pointer, :pointer, :int], :int
 			
-			attach_function :mysql_num_rows, [:pointer], :uint64
-			attach_function :mysql_num_fields, [:pointer], :uint32
+			ffi_attach_function :mysql_num_rows, [:pointer], :uint64
+			ffi_attach_function :mysql_num_fields, [:pointer], :uint32
 			
-			attach_function :mysql_fetch_fields, [:pointer], :pointer
+			ffi_attach_function :mysql_fetch_fields, [:pointer], :pointer
 			
 			class Result < FFI::Pointer
 				def initialize(connection, types = {}, address)
@@ -109,6 +109,16 @@ module DB
 					@connection.check_error!("Reading recordset")
 				end
 				
+				def map(&block)
+					results = []
+					
+					self.each do |row|
+						results << yield row
+					end
+					
+					return results
+				end
+				
 				def to_a
 					rows = []
 					

data/lib/db/mariadb/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: ffi-module
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/.DS_Store
 - lib/db/mariadb.rb
 - lib/db/mariadb/adapter.rb
 - lib/db/mariadb/connection.rb
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: An event-driven interface for MariaDB and MySQL servers.