db-mariadb 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d18fa619ccfc3b043299790a3e6a275670ce48614304355e3f75ba5ed1cdc202
-  data.tar.gz: eb9e90465532de40869b545c1a65158136e2efbedeff6440f061c4f45d486e8d
+  metadata.gz: 0a1f813a41ba085973e25fa022a584a0c120f18f12fe594bfaaf017e9472a398
+  data.tar.gz: 071c14dabb9d116bc052deba2f6c5271de3a529da85751d4f80896e17b900944
 SHA512:
-  metadata.gz: ec5a4ceca8186959f19019e92cc77a53e945e4834f2c7776d60b78688c32d5f614e243a868b19f584e93c70bd8c19360525a1e2b11d9b597a37a83ae247e239b
-  data.tar.gz: 65b204be2c1c3f4dfa24f114246a2ec32913aceb580c7be40333aafe8c89a5680098612fae30136f8d537821d246ae9bf508def1f367d57db9c0bb59f767bd82
+  metadata.gz: b2d0d0378368327366ad5d307a6a512a32e1c583d16aa4ef4c32cc2947b83a3338789f2136a085c04de4cfd90c976ddfd338ef9dcf0ed1470330a6fd3f75610f
+  data.tar.gz: 8b57240bc3ae4698c68ad0c6f74bf107a9cd6d3b38ec5be898359fec3a1d966ab42892e18da0e8167d27856165824e236424d607e380a0234a7da47772e78506

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

@@ -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"
 				
-				if primary_key
+				if primary
 					buffer << " 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/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
@@ -70,10 +73,14 @@ module DB
 			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
@@ -82,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.3.0"
+		VERSION = "0.7.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-mariadb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -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.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: An event-driven interface for MariaDB and MySQL servers.