Skip to content

Update MySQLCRUD.swift, Fix Warnings, Update MySQL.swift, Added missing autocommit call #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: swift5
Choose a base branch
from
Open

Update MySQLCRUD.swift, Fix Warnings, Update MySQL.swift, Added missing autocommit call #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba9a70e
Added missing autocommit call
SkOODaT Mar 21, 2022
4af3f16
Update MySQL.swift
SkOODaT Mar 21, 2022
76ed9da
Fix Warnings
SkOODaT Mar 21, 2022
8248d36
Update MySQLCRUD.swift
SkOODaT Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Sources/PerfectMySQL/MySQL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ public final class MySQL {
}
return result
}


/// If false it starts transaction which can be rolled back
public func autocommit(_ autocommit: Bool) -> Bool {
return mysql_autocommit(mysqlPtr, autocommit)
}

/// Commits the transaction
public func commit() -> Bool {
var res = mysql_commit(mysqlPtr)
Expand Down Expand Up @@ -248,7 +253,7 @@ public final class MySQL {
/// Sets connect options for connect() with boolean option argument
@discardableResult
public func setOption(_ option: MySQLOpt, _ b: Bool) -> Bool {
var myB = my_bool(b ? 1 : 0)
var myB = false ? 1 : 0
Copy link

@Fabio1988 Fabio1988 Jun 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And param is ignored? Why removed my_bool? That's already fixed, it can be used without problems :)

Copy link

@Fabio1988 Fabio1988 Jun 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SkOODaT

Copy link

@Fabio1988 Fabio1988 Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SkOODaT pls revert that change on this line

return mysql_options(mysqlPtr, exposedOptionToMySQLOption(option), &myB) == 0
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/PerfectMySQL/MySQLCRUD.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ public struct MySQLDatabaseConfiguration: DatabaseConfigurationProtocol {
}

public func sqlExeDelegate(forSQL: String) throws -> SQLExeDelegate {
let noPrepCommands = ["CREATE", "DROP", "ALTER", "BEGIN", "COMMIT", "ROLLBACK"]
let noPrepCommands = ["CREATE", "DROP", "ALTER", "BEGIN", "COMMIT", "ROLLBACK", "LOCK", "UNLOCK"]
if nil != noPrepCommands.first(where: { forSQL.hasPrefix($0) }) {
return MySQLDirectExeDelegate(connection: connection, sql: forSQL)
}
Expand Down
10 changes: 7 additions & 3 deletions Sources/PerfectMySQL/MySQLStmt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,13 @@ public final class MySQLStmt {

private func allocated(_ a: [Int8]) -> UnsafeMutableRawBufferPointer? {
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: a.count, alignment: 0)
let u = UnsafeRawPointer(a)
if let p = buffer.baseAddress {
memcpy(p, u, a.count)
a.withUnsafeBytes{ (bufferRawBufferPointer) -> Void in
let bufferPointer: UnsafePointer<UInt8> = bufferRawBufferPointer.baseAddress!.assumingMemoryBound(to: UInt8.self)
let rawPtr = UnsafeRawPointer(bufferPointer)
//let u = UnsafeRawPointer(a)
if let p = buffer.baseAddress {
memcpy(p, rawPtr, a.count)
}
}
return buffer
}
Expand Down