Improved parsers (#352, #362).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -22,6 +22,21 @@ Thin Mode Changes
     (`issue 368 <https://github.com/oracle/python-oracledb/issues/368>`__).
 #)  Fixed bug resulting in an inability to connect to Oracle Database 23ai
     instances which have fast authentication disabled.
+#)  Reworked connection string parser:
+
+    - Fixed parsing an :ref:`Easy Connect <easyconnect>` string starting
+      with "`//`" (`issue 352
+      <https://github.com/oracle/python-oracledb/issues/352>`__).
+    - Fixed parsing an Easy Connect string with multiple hosts (a comma for
+      multiple addresses and a semicolon for multiple address lists).
+    - Fixed parsing an Easy Connect string with a static IPv6 address.
+    - Improved error when a connect descriptor parameter like DESCRIPTION or
+      ADDRESS incorrectly contains a simple value instead of nested values.
+
+#)  Reworked :ref:`tnsnames.ora<optnetfiles>` file parser to handle multiple
+    aliases found on separate lines (`issue 362
+    <https://github.com/oracle/python-oracledb/issues/362>`__).
+
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/base_impl.pxd

@@ -398,6 +398,7 @@ cdef class Address(ConnectParamsNode):
         public uint32_t https_proxy_port
 
     cdef str build_connect_string(self)
+    cdef int set_protocol(self, str value) except -1
 
 
 cdef class AddressList(ConnectParamsNode):
@@ -429,6 +430,7 @@ cdef class Description(ConnectParamsNode):
 
     cdef str _build_duration_str(self, double value)
     cdef str build_connect_string(self, str cid=*)
+    cdef int set_server_type(self, str value) except -1
 
 
 cdef class DescriptionList(ConnectParamsNode):
@@ -482,10 +484,6 @@ cdef class ConnectParamsImpl:
     cdef object _get_token_expires(self, str token)
     cdef str _get_wallet_password(self)
     cdef int _parse_connect_string(self, str connect_string) except -1
-    cdef int _parse_easy_connect_string(self, str connect_string,
-                                        object match) except -1
-    cdef int _process_connect_descriptor(self, str connecte_string,
-                                         dict args) except -1
     cdef int _set_access_token(self, object val, int error_num) except -1
     cdef int _set_access_token_param(self, object val) except -1
     cdef int _set_new_password(self, str password) except -1
@@ -788,6 +786,21 @@ cdef class BindVar:
                            uint32_t row_num, uint32_t num_elements,
                            bint defer_type_assignment) except -1
 
+cdef class BaseParser:
+
+    cdef:
+        ssize_t pos, temp_pos, num_chars
+        str data_as_str
+        int data_kind
+        void *data
+
+    cdef Py_UCS4 get_current_char(self)
+    cdef int initialize(self, str data_to_parse) except -1
+    cdef int parse_keyword(self) except -1
+    cdef int parse_quoted_string(self, Py_UCS4 quote_type) except -1
+    cdef int skip_spaces(self) except -1
+
+
 cdef int get_preferred_num_type(int16_t precision, int8_t scale)
 cdef void pack_uint16(char_type *buf, uint16_t x, int order)
 cdef void pack_uint32(char_type *buf, uint32_t x, int order)

src/oracledb/base_impl.pyx

@@ -50,7 +50,6 @@ import inspect
 import json
 import os
 import random
-import re
 import secrets
 import ssl
 import sys
@@ -94,6 +93,7 @@ include "impl/base/constants.pxi"
 include "impl/base/defaults.pyx"
 include "impl/base/utils.pyx"
 include "impl/base/buffer.pyx"
+include "impl/base/parsers.pyx"
 include "impl/base/oson.pyx"
 include "impl/base/vector.pyx"
 include "impl/base/connect_params.pyx"

src/oracledb/errors.py

@@ -247,8 +247,8 @@ def _raise_not_supported(feature: str) -> None:
 ERR_INVALID_COLL_INDEX_GET = 2038
 ERR_INVALID_COLL_INDEX_SET = 2039
 ERR_EXECUTE_MODE_ONLY_FOR_DML = 2040
-ERR_MISSING_QUOTE_IN_STRING = 2041
-ERR_MISSING_QUOTE_IN_IDENTIFIER = 2042
+ERR_MISSING_ENDING_SINGLE_QUOTE = 2041
+ERR_MISSING_ENDING_DOUBLE_QUOTE = 2042
 ERR_DBOBJECT_ATTR_MAX_SIZE_VIOLATED = 2043
 ERR_DBOBJECT_ELEMENT_MAX_SIZE_VIOLATED = 2044
 ERR_INVALID_ARRAYSIZE = 2045
@@ -349,8 +349,8 @@ def _raise_not_supported(feature: str) -> None:
     28: ERR_CONNECTION_CLOSED,
     600: ERR_CONNECTION_CLOSED,
     1005: ERR_NO_CREDENTIALS,
-    1740: ERR_MISSING_QUOTE_IN_IDENTIFIER,
-    1756: ERR_MISSING_QUOTE_IN_STRING,
+    1740: ERR_MISSING_ENDING_DOUBLE_QUOTE,
+    1756: ERR_MISSING_ENDING_SINGLE_QUOTE,
     22165: (
         ERR_INVALID_COLL_INDEX_SET,
         r"index \[(?P<index>\d+)\] must be in the range of "
@@ -610,8 +610,8 @@ def _raise_not_supported(feature: str) -> None:
         "not provided"
     ),
     ERR_MISSING_FILE: "file '{file_name}' is missing or unreadable",
-    ERR_MISSING_QUOTE_IN_IDENTIFIER: 'missing ending quote (") in identifier',
-    ERR_MISSING_QUOTE_IN_STRING: "missing ending quote (') in string",
+    ERR_MISSING_ENDING_DOUBLE_QUOTE: 'missing ending quote (")',
+    ERR_MISSING_ENDING_SINGLE_QUOTE: "missing ending quote (')",
     ERR_MISSING_TYPE_NAME_FOR_OBJECT_VAR: (
         "no object type specified for object variable"
     ),