Skip to content

Fix: Add forgotten oursql.c (Py3) #16

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 6 commits into
base: py3k
Choose a base branch
from
Open

Fix: Add forgotten oursql.c (Py3) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03b2f1f
Fix: Add forgotten oursql.c
phdru Jan 13, 2018
2619972
Fix indentation
PaulFurtado Aug 8, 2016
fb43b0a
Remove variable declaration from for-loop header and enclose in block
PaulFurtado Aug 8, 2016
19fb25d
make oursql compile against mariadb and mysql 5.6 / 5.7
ndparker Feb 6, 2017
b5f3be2
Fix: Regenerate by Cython 0.29.6 for Python 3.7 compatibility
phdru Apr 1, 2019
d2c1bc0
Fix: Regenerate by Cython 0.29.21 for Python 3.9 compatibility
phdru Nov 21, 2020
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
24 changes: 20 additions & 4 deletions oursqlx/_exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,26 @@ enum _oursqlx_exception_type _oursqlx_exc_from_errno(int err) {
return _oursqlx_PermissionsError;

default:
if (err >= ER_ERROR_FIRST && err <= ER_ERROR_LAST)
return _oursqlx_ProgrammingError;
else if (err > CR_MIN_ERROR && err < CR_MAX_ERROR)
return _oursqlx_InterfaceError;
#if MYSQL_VERSION_ID >= 50700 && !defined(ER_ERROR_FIRST)
{
unsigned int i;
for(i = 0; i < sizeof(errmsg_section_start)/sizeof(int); ++i) {
int min = errmsg_section_start[i];
int max = errmsg_section_start[i] + errmsg_section_size[i] - 1;
if ( err >= min && err <= max ) {
return _oursqlx_ProgrammingError;
}
}
if ( err > CR_MIN_ERROR && err < CR_MAX_ERROR) {
return _oursqlx_InterfaceError;
}
}
#else
if (err >= ER_ERROR_FIRST && err <= ER_ERROR_LAST)
return _oursqlx_ProgrammingError;
else if (err > CR_MIN_ERROR && err < CR_MAX_ERROR)
return _oursqlx_InterfaceError;
#endif
}
return _oursqlx_UnknownError;
}
Loading