VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-08-11 02:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix required Connector/C version:

Browse Source 
Since Connector 3.2.x is discontinued, we need
to bump the miimum required version to 3.3.1.
This commit is contained in:
Georg Richter
2022-11-21 11:59:01 +01:00
parent fa6cda4445
commit ea87f4472b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb/mariadb_connection.c
View File

@ -774,8 +774,10 @@ MrdbConnection_getinfo(MrdbConnection *self, PyObject *args)
case MARIADB_CONNECTION_SERVER_CAPABILITIES: case MARIADB_CONNECTION_SERVER_CAPABILITIES:
case MARIADB_CONNECTION_EXTENDED_SERVER_CAPABILITIES: case MARIADB_CONNECTION_EXTENDED_SERVER_CAPABILITIES:
case MARIADB_CONNECTION_CLIENT_CAPABILITIES: case MARIADB_CONNECTION_CLIENT_CAPABILITIES:
#ifdef MARIADB_CONNECTION_BYTES_READ
case MARIADB_CONNECTION_BYTES_READ: case MARIADB_CONNECTION_BYTES_READ:
case MARIADB_CONNECTION_BYTES_SENT: case MARIADB_CONNECTION_BYTES_SENT:
#endif
return PyLong_FromLong((long)val.num); return PyLong_FromLong((long)val.num);
break; break;
default: default:

4
mariadb_posix.py
View File

@ -46,7 +46,7 @@ def dequote(s):
def get_config(options): def get_config(options):
required_version = "3.2.4" required_version = "3.3.1"
static = options["link_static"] static = options["link_static"]
try: try:
@ -54,7 +54,7 @@ def get_config(options):
config_prg = os.environ["MARIADB_CONFIG"] config_prg = os.environ["MARIADB_CONFIG"]
except KeyError: except KeyError:
config_prg = options["mariadb_config"] config_prg = options["mariadb_config"]
subprocess.call([config_prg, "--version"]) subprocess.call([config_prg, "--cc_version"])
except FileNotFoundError: except FileNotFoundError:
# using default from path # using default from path
config_prg = "mariadb_config" config_prg = "mariadb_config"

2
setup.py
View File

@ -34,7 +34,7 @@ PY_MARIADB_PATCH_VERSION = 5
PY_MARIADB_PRE_RELEASE_SEGMENT = None PY_MARIADB_PRE_RELEASE_SEGMENT = None
PY_MARIADB_PRE_RELEASE_NR = 0 PY_MARIADB_PRE_RELEASE_NR = 0
PY_MARIADB_POST_RELEASE_SEGMENT = "post" PY_MARIADB_POST_RELEASE_SEGMENT = "post"
PY_MARIADB_POST_RELEASE_NR = "2" PY_MARIADB_POST_RELEASE_NR = "3"
PY_MARIADB_VERSION = "%s.%s.%s" % (PY_MARIADB_MAJOR_VERSION, PY_MARIADB_VERSION = "%s.%s.%s" % (PY_MARIADB_MAJOR_VERSION,
PY_MARIADB_MINOR_VERSION, PY_MARIADB_MINOR_VERSION,