Merge pull request #31 from RockfordWei/master

Upgrading to MySQL 8.0.11 while keeping the downcast compatibility to 5.7.21

Author: kjessup

README.md

@@ -76,12 +76,6 @@ swift package generate-xcodeproj
 ```
 After this you have to set the path for libraries again.
 
-⚠️**NOTE**⚠️ The last mysql homebrew version that Perfect currently supports is 5.7, so please try this command when some missing type issues were found on your build:
-
-```
-$ brew install mysql@5.7 && brew link mysql@5.7 --force
-```
-
 ## Linux Build Notes
 
 Ensure that you have installed libmysqlclient-dev for MySQL version *5.6 or greater*.

Sources/PerfectMySQL/MySQL.swift

@@ -100,17 +100,23 @@ public final class MySQL {
 
 	/// Commits the transaction
 	public func commit() -> Bool {
-		return 1 == mysql_commit(mysqlPtr)
+		var res = mysql_commit(mysqlPtr)
+    	var FALSE = 0
+    	return memcmp(&res, &FALSE, MemoryLayout.size(ofValue: res)) != 0
 	}
 
 	/// Rolls back the transaction
 	public func rollback() -> Bool {
-		return 1 == mysql_rollback(mysqlPtr)
+		var res = mysql_rollback(mysqlPtr)
+    	var FALSE = 0
+    	return memcmp(&res, &FALSE, MemoryLayout.size(ofValue: res)) != 0
 	}
 
 	/// Checks whether any more results exist
 	public func moreResults() -> Bool {
-		return 1 == mysql_more_results(mysqlPtr)
+		var res = mysql_more_results(mysqlPtr)
+    	var FALSE = 0
+    	return memcmp(&res, &FALSE, MemoryLayout.size(ofValue: res)) != 0
 	}
 
 	/// Returns/initiates the next result in multiple-result executions
@@ -169,22 +175,24 @@ public final class MySQL {
 			return MYSQL_OPT_WRITE_TIMEOUT
 		case MySQLOpt.MYSQL_OPT_USE_RESULT:
 			return MYSQL_OPT_USE_RESULT
+		/*
 		case MySQLOpt.MYSQL_OPT_USE_REMOTE_CONNECTION:
 			return MYSQL_OPT_USE_REMOTE_CONNECTION
-		case MySQLOpt.MYSQL_OPT_USE_EMBEDDED_CONNECTION:
+    	case MySQLOpt.MYSQL_OPT_USE_EMBEDDED_CONNECTION:
 			return MYSQL_OPT_USE_EMBEDDED_CONNECTION
 		case MySQLOpt.MYSQL_OPT_GUESS_CONNECTION:
 			return MYSQL_OPT_GUESS_CONNECTION
 		case MySQLOpt.MYSQL_SET_CLIENT_IP:
 			return MYSQL_SET_CLIENT_IP
 		case MySQLOpt.MYSQL_SECURE_AUTH:
 			return MYSQL_SECURE_AUTH
+		*/
 		case MySQLOpt.MYSQL_REPORT_DATA_TRUNCATION:
 			return MYSQL_REPORT_DATA_TRUNCATION
 		case MySQLOpt.MYSQL_OPT_RECONNECT:
 			return MYSQL_OPT_RECONNECT
-		case MySQLOpt.MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
-			return MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+		//case MySQLOpt.MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
+			//return MYSQL_OPT_SSL_VERIFY_SERVER_CERT
 		case MySQLOpt.MYSQL_PLUGIN_DIR:
 			return MYSQL_PLUGIN_DIR
 		case MySQLOpt.MYSQL_DEFAULT_AUTH:

Sources/PerfectMySQL/MySQLStmt.swift

@@ -210,10 +210,15 @@ public final class MySQLStmt {
 	/// Executes a prepared statement, binding parameters if needed
 	public func execute() -> Bool {
 		if paramBindsOffset > 0 {
-			guard let paramBinds = self.paramBinds,
-				0 == mysql_stmt_bind_param(ptr, paramBinds) else {
+			guard let paramBinds = self.paramBinds else {
 					return false
 			}
+      		var res = mysql_stmt_bind_param(ptr, paramBinds)
+      		var FALSE = 0
+      		let cmp = memcmp(&res, &FALSE, MemoryLayout.size(ofValue: res))
+      		guard cmp == 0 else {
+				return false
+      		}
 		}
 		let r = mysql_stmt_execute(ptr)
 		return r == 0
@@ -354,7 +359,7 @@ public final class MySQLStmt {
 	private func genBind<T: UnsignedInteger>(type: enum_field_types, value: T) -> MYSQL_BIND {
 		var bind = MYSQL_BIND()
 		bind.buffer_type = type
-		bind.is_unsigned = 1
+		memset(&(bind.is_unsigned), 1, MemoryLayout.size(ofValue: bind.is_unsigned))
 		bind.buffer_length = UInt(MemoryLayout<T>.size)
 		let b = UnsafeMutablePointer<T>.allocate(capacity: 1)
 		b.initialize(to: value)
@@ -634,7 +639,9 @@ public final class MySQLStmt {
 
 		private func valueForField(_ n: Int) -> Any? {
 			var bind = binds[n]
-			guard bind.is_null.pointee == 0 else {
+      		var FALSE = 0
+      		var cmp = memcmp(bind.is_null, &FALSE, MemoryLayout.size(ofValue: bind.is_null.pointee))
+			guard cmp == 0 else {
 				return nil
 			}
 			let genType = mysqlTypeToGeneralType(bind.buffer_type)
@@ -649,7 +656,8 @@ public final class MySQLStmt {
 				default: return nil
 				}
 			case .integer:
-				if bind.is_unsigned == 1 {
+        		cmp = memcmp(&(bind.is_unsigned), &FALSE, MemoryLayout.size(ofValue: bind.is_unsigned))
+				if cmp != 0 {
 					switch bind.buffer_type {
 					case MYSQL_TYPE_LONGLONG:
 						return bind.buffer.assumingMemoryBound(to: UInt64.self).pointee
@@ -766,8 +774,8 @@ public final class MySQLStmt {
 				var bind = bindField(field)
 				bind.length = lengthBuffers.advanced(by: i)
 				bind.length.initialize(to: 0)
-				bind.is_null = isNullBuffers.advanced(by: i)
-				bind.is_null.initialize(to: 0)
+				bind.is_null = unsafeBitCast(isNullBuffers.advanced(by: i), to: type(of: bind.is_null))
+        		memset(bind.is_null, 0, MemoryLayout.size(ofValue: bind.is_null.pointee))
 
 				let genType = mysqlTypeToGeneralType(field)
 				switch genType {
@@ -781,7 +789,7 @@ public final class MySQLStmt {
 					}
 				case .integer:
 					if (f.flags & _UNSIGNED_FLAG) == _UNSIGNED_FLAG {
-						bind.is_unsigned = 1
+						memset(&(bind.is_unsigned), 1, MemoryLayout.size(ofValue: bind.is_unsigned))
 						switch bind.buffer_type {
 						case MYSQL_TYPE_LONGLONG:
 							bind = bindBuffer(bind, type: UInt64.self);
@@ -829,7 +837,10 @@ public final class MySQLStmt {
 					default: break
 					}
 				case .integer:
-					if bind.is_unsigned == 1 {
+          			var FALSE = 0
+          			var res = bind.is_unsigned
+          			let cmp = memcmp(&res, &FALSE, MemoryLayout.size(ofValue: res))
+					if cmp != 0 {
 						switch bind.buffer_type {
 						case MYSQL_TYPE_LONGLONG:
 							bind.buffer.assumingMemoryBound(to: UInt64.self).deallocate()

Sources/PerfectMySQL/PerfectMySQL.swift

@@ -96,10 +96,11 @@ public enum MySQLOpt {
 	MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE,
 	MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME, MYSQL_OPT_READ_TIMEOUT,
 	MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT,
-	MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
-	MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
+	//MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
+	//MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
 	MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
-	MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
+	//MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+ 	MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
 	MYSQL_OPT_BIND,
 	MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT,
 	MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER,

Tests/PerfectMySQLTests/PerfectMySQLTests.swift

@@ -284,7 +284,6 @@ class PerfectMySQLTests: XCTestCase {
 	func testQueryStmt2() {
 		let mysql = rawMySQL
 		XCTAssert(mysql.query(statement: "DROP TABLE IF EXISTS all_data_types"))
-		
 		let qres = mysql.query(statement: "CREATE TABLE `all_data_types` (`varchar` VARCHAR( 22 ),\n`tinyint` TINYINT,\n`text` TEXT,\n`date` DATE,\n`smallint` SMALLINT,\n`mediumint` MEDIUMINT,\n`int` INT,\n`bigint` BIGINT,\n`ubigint` BIGINT UNSIGNED,\n`float` FLOAT( 10, 2 ),\n`double` DOUBLE,\n`decimal` DECIMAL( 10, 2 ),\n`datetime` DATETIME,\n`timestamp` TIMESTAMP,\n`time` TIME,\n`year` YEAR,\n`char` CHAR( 10 ),\n`tinyblob` TINYBLOB,\n`tinytext` TINYTEXT,\n`blob` BLOB,\n`mediumblob` MEDIUMBLOB,\n`mediumtext` MEDIUMTEXT,\n`longblob` LONGBLOB,\n`longtext` LONGTEXT,\n`enum` ENUM( '1', '2', '3' ),\n`set` SET( '1', '2', '3' ),\n`bool` BOOL,\n`binary` BINARY( 20 ),\n`varbinary` VARBINARY( 20 ) ) ENGINE = MYISAM")
 		XCTAssert(qres == true, mysql.errorMessage())