db-mariadb 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1f813a41ba085973e25fa022a584a0c120f18f12fe594bfaaf017e9472a398
-  data.tar.gz: 071c14dabb9d116bc052deba2f6c5271de3a529da85751d4f80896e17b900944
+  metadata.gz: cdabbcef5551dd3be495d8d81e4c9f0429869d122d6bd709e70b34e3559920c6
+  data.tar.gz: 7535f54e25c490e9269ded81e9e817f898ba2945d65beeb0d1d1e48058b8a41a
 SHA512:
-  metadata.gz: b2d0d0378368327366ad5d307a6a512a32e1c583d16aa4ef4c32cc2947b83a3338789f2136a085c04de4cfd90c976ddfd338ef9dcf0ed1470330a6fd3f75610f
-  data.tar.gz: 8b57240bc3ae4698c68ad0c6f74bf107a9cd6d3b38ec5be898359fec3a1d966ab42892e18da0e8167d27856165824e236424d607e380a0234a7da47772e78506
+  metadata.gz: a0e0faeb7065dd9138baabdde82200083ad769d72ee5149a414a68b8122d4ad884c4308544d66d8aa9c6d55cb46759e5fc6890f1f718124d6f248018229bcdba
+  data.tar.gz: 37bc20b8fa6b5ee0b047ba8d2b95b2b2176b9414a918ba0831e039aac94ca8f8e1c849c8e483d6334b1c0e71a891c01b74b7223d36d17b0e2b3a705b2f9a9fa6

data/lib/db/mariadb/connection.rb

@@ -86,10 +86,10 @@ module DB
 				
 				append_identifier(name, buffer)
 				
-				buffer << " BIGINT AUTO_INCREMENT"
+				buffer << " BIGINT"
 				
 				if primary
-					buffer << " PRIMARY KEY"
+					buffer << " AUTO_INCREMENT PRIMARY KEY"
 				elsif !null
 					buffer << " NOT NULL"
 				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

@@ -39,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)

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,
@@ -74,7 +74,7 @@ module DB
 				year: Types::Integer,
 				newdate: Types::DateTime,
 				bit: Types::Integer,
-				json: JSON,
+				json: Types::JSON,
 				newdecimal: Types::Decimal,
 				enum: Types::Symbol,
 				set: Types::Integer,

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/native/types.rb

@@ -29,33 +29,41 @@ module DB
 			module Types
 				module Integer
 					def self.parse(string)
-						Integer(string)
+						Integer(string) if string
 					end
 				end
 				
 				module Decimal
 					def self.parse(string)
-						BigDecimal(string)
+						BigDecimal(string) if string
 					end
 				end
 				
 				module Float
 					def self.parse(string)
-						Float(string)
+						Float(string) if string
 					end
 				end
 				
 				module Symbol
 					def self.parse(string)
-						string.to_sym
+						string&.to_sym
 					end
 				end
 				
 				module DateTime
 					def self.parse(string)
-						parts = string.split(/[\-\s:]/)
-						
-						return Time.utc(*parts)
+						if string
+							parts = string.split(/[\-\s:]/)
+							
+							return Time.utc(*parts)
+						end
+					end
+				end
+				
+				module JSON
+					def self.parse(string)
+						::JSON.parse(string, symbolize_names: true) if string
 					end
 				end
 			end

data/lib/db/mariadb/version.rb

@@ -20,6 +20,6 @@
 
 module DB
 	module MariaDB
-		VERSION = "0.7.0"
+		VERSION = "0.9.0"
 	end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-23 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