- minor Documentatiion fixes

- fixed test cases using removed character set option

include/docs/common.h

@@ -4,24 +4,24 @@
 "\n"\
 "Establishes a connection to a database server and returns a connection\n"\
 "object.\n\n"\
-"Connection attributes:\n"\
+"Connection parameters are provided as a set of keyword arguments:\n"\
 "----------------------\n"\
-"user: string\n"\
-"    username used to authenticate with the database server\n\n"\
-"password: string\n"\
-"    password to authenticate\n\n"\
 "host: string\n"\
-"    host name or IP address of the database server\n\n"\
+"    The host name or IP address of the database server\n\n"\
+"user: string\n"\
+"    The username used to authenticate with the database server\n\n"\
+"password: string\n"\
+"    The password of the given user\n\n"\
 "database: string\n"\
-"    database (schema) name to used when connecting with the database\n"\
+"    database (schema) name to use when connecting with the database\n"\
 "    server\n\n"\
 "unix_socket: string\n"\
-"    location of the unix socket file\n\n"\
+"    The location of the unix socket file to use instead of using an IP port\n"\
+"    to connect. If socket authentication is enabled, this can also be used\n"\
+"    in place of a password.\n\n"\
 "port: integer\n"\
 "    port number of the database server. If not specified the default\n"\
-"    value (=3306) will be used.\n\n"\
+"    value of 3306 will be used.\n\n"\
-"charset: string\n"\
-"    default character set to be used\n\n"\
 "connect_timeout: integer\n"\
 "    connect timeout in seconds\n\n"\
 "read_timeout: integer\n"\
@@ -67,4 +67,4 @@
 "ssl_verify_server_cert: boolean\n"\
 "    Enables server certificate verification.\n\n"\
 "ssl_enforce: Boolean\n"\
-"    Always use a secure TLS connection\n\n"
+"    The connection must use TLS security or it will fail.\n\n"

include/docs/connection.h

@@ -24,7 +24,7 @@ PyDoc_STRVAR(
 PyDoc_STRVAR(
   connection__doc__,
   "The Connection class is used to open and manage a connection to a\n"
-  "database server"
+  "MariaDB or compatible database server"
 );
 
 PyDoc_STRVAR(

include/docs/module.h

@@ -18,7 +18,7 @@
 *************************************************************************************/
 PyDoc_STRVAR(
   module_binary__doc__,
-  "binary(string)\n"
+  "Binary(string)\n"
   "--\n"
   "\n"
   "This function constructs an object capable of holding a binary (long)\n"

include/mariadb_python.h

@@ -65,7 +65,7 @@ int clock_gettime(int dummy, struct timespec *ct);
 #endif /* L64 */
 #endif /* _WIN32 */
 
-#define MAX_TPC_XID_SIZE 65
+#define MAX_TPC_XID_SIZE 64
 #define POOL_DEFAULT_SIZE 5
 
 /* Magic constant for checking dynamic columns */
@@ -134,7 +134,7 @@ typedef struct {
     uint8_t is_buffered;
     uint8_t is_closed;
     enum enum_tpc_state tpc_state;
-    char xid[MAX_TPC_XID_SIZE];
+    char xid[150]; /* large enough, to hold 2 * MAX_TPC_XID size + integer value */
     PyObject *dsn; /* always null */
     PyObject *tls_cipher;
     PyObject *tls_version;

setup.py

@@ -29,7 +29,7 @@ setup(name='mariadb',
       version='0.9.54',
       python_requires='>=3.6',
       classifiers = [
-          'Development Status :: 3 - Alpha',
+          'Development Status :: 4 - Beta',
           'Environment :: Console',
           'Environment :: MacOS X',
           'Environment :: Win32 (MS Windows)',
@@ -55,7 +55,7 @@ setup(name='mariadb',
       url='https://www.github.com/mariadb-corporation/mariadb-connector-python',
       project_urls={
          "Bug Tracker": "https://jira.mariadb.org/",
-         "Documentation": "https://github.com/mariadb-corporation/mariadb-connector-python/wiki",
+         "Documentation": "https://mariadb-connectorpython.readthedocs.io/en/latest/",
          "Source Code": "https://www.github.com/mariadb-corporation/mariadb-connector-python",
       },
       ext_modules=[Extension('mariadb', ['src/mariadb.c', 'src/mariadb_connection.c',

src/mariadb_exception.c

@@ -42,7 +42,6 @@ static PyObject *get_exception_type(const char *sqlstate)
   if (!sqlstate || strlen(sqlstate) != 5)
     return NULL;
 
-
   if (!strncmp(sqlstate, "21", 2) ||
       !strncmp(sqlstate, "22", 2) ||
       !strncmp(sqlstate, "02", 2))
@@ -88,6 +87,7 @@ static PyObject *get_exception_type(const char *sqlstate)
       !strncmp(sqlstate, "42", 2) ||
       !strncmp(sqlstate, "70", 2))
     return Mariadb_ProgrammingError;
+
   return NULL;
 }
 

test/integration/test_cursor.py

@@ -613,7 +613,7 @@ class TestCursor(unittest.TestCase):
         # F0 9F 8C B6 🌶 unicode 7 hot pepper
         # F0 9F 8E A4 🎤 unicode 8 no microphones
         # F0 9F A5 82 🥂 unicode 9 champagne glass
-        con = create_connection({"charset": "utf8mb4"})
+        con = create_connection()
         cursor = con.cursor()
         cursor.execute(
             "CREATE TEMPORARY TABLE `test_utf8` (`test` blob)")
@@ -623,17 +623,6 @@ class TestCursor(unittest.TestCase):
         self.assertEqual(row[0], b"\xf0\x9f\x98\x8e\xf0\x9f\x8c\xb6\xf0\x9f\x8e\xa4\xf0\x9f\xa5\x82")
         del cursor, con
 
-    def test_latin2(self):
-        con = create_connection({"charset": "cp1251"})
-        cursor = con.cursor()
-        cursor.execute(
-            "CREATE TEMPORARY TABLE `test_latin2` (`test` blob)")
-        cursor.execute("INSERT INTO test_latin2 VALUES (?)", (b"\xA9\xB0",))
-        cursor.execute("SELECT * FROM test_latin2")
-        row = cursor.fetchone()
-        # self.assertEqual(row[0], b"\xf0\x9f\x98\x8e\xf0\x9f\x8c\xb6\xf0\x9f\x8e\xa4\xf0\x9f\xa5\x82")
-        del cursor, con
-
     def test_conpy27(self):
         con = create_connection()
         cursor = con.cursor(prepared=True)