Skip to content

Compatible with MySQL support for non Arabic English characters. #1086

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
rainyt wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

Compatible with MySQL support for non Arabic English characters. #1086

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
10 changes: 8 additions & 2 deletions src/hx/libs/mysql/Mysql.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,10 @@ Dynamic _hx_mysql_request(Dynamic handle,String req)
{
Connection *connection = getConnection(handle);

if( mysql_real_query(connection->m,req.utf8_str(),req.length) != 0 )
Array< unsigned char > bytes = Array_obj< unsigned char >::__new();
__hxcpp_bytes_of_string(bytes, req);

if( mysql_real_query(connection->m,req.utf8_str(),bytes.__length()) != 0 )
error(connection->m,req);

MYSQL_RES *res = mysql_store_result(connection->m);
Expand Down Expand Up @@ -516,7 +519,10 @@ String _hx_mysql_escape(Dynamic handle,String str)
int len = str.length * 2 + 1;
AutoBuf sout(len);

int finalLen = mysql_real_escape_string(connection->m,sout.buffer,str.utf8_str(),str.length);
Array< unsigned char > bytes = Array_obj< unsigned char >::__new();
__hxcpp_bytes_of_string(bytes, str);

int finalLen = mysql_real_escape_string(connection->m,sout.buffer,str.utf8_str(),bytes.__length());
if( finalLen < 0 )
hx::Throw( HX_CSTRING("Unsupported charset : ") + String(mysql_character_set_name(connection->m)) );

Expand Down