Skip to content

utf8,null and affected rows #34

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
sayzard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

utf8,null and affected rows #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Sources/MySQLDriver/Statement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ public extension MySQL {
break

case let str as String:
if str.characters.count < MySQL.maxPackAllowed - 1024*1024 {
let lenArr = MySQL.Utils.lenEncIntArray(UInt64(str.characters.count))
if str.utf8.count < MySQL.maxPackAllowed - 1024*1024 {
let lenArr = MySQL.Utils.lenEncIntArray(UInt64(str.utf8.count))
dataTypeArr += [UInt8].UInt16Array(UInt16(MysqlTypes.MYSQL_TYPE_STRING))
argsArr += lenArr
argsArr += [UInt8](str.utf8)
Expand Down
2 changes: 1 addition & 1 deletion Sources/MySQLDriver/mysql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public struct MySQL {
var dbname:String?
var port : Int?

var affectedRows : UInt64 = 0
open var affectedRows : UInt64 = 0
open var insertId : UInt64 = 0
var status : UInt16 = 0
open var conID = UUID().uuidString
Expand Down
4 changes: 4 additions & 0 deletions Sources/MySQLDriver/sha1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ protocol BitshiftOperationsType {
func << <T:SignedInteger>(lhs: T, rhs: Int) -> Int {
let a = lhs as! Int
let b = rhs
if a == 00
{
return 0
}
return a << b
}

Expand Down