Skip to content

Commit 2a6be23

Browse files
Documentation improvements.
1 parent e38a982 commit 2a6be23

File tree

4 files changed

+35
-17
lines changed

4 files changed

+35
-17
lines changed

doc/src/api_manual/connect_param.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,19 @@ ConnectParams Methods
3232
pairs, or a simple alias which is looked up in ``tnsnames.ora``. Parameters
3333
that are found in the connect string override any currently stored values.
3434

35-
.. method:: ConnectParams.set()
35+
.. method:: ConnectParams.set(user=None, proxy_user=None, password=None, \
36+
newpassword=None, wallet_password=None, host=None, port=None, protocol=None, \
37+
https_proxy=None, https_proxy_port=None, service_name=None, sid=None, \
38+
server_type=None, cclass=None, purity=None, expire_time=None, retry_count=None, \
39+
retry_delay=None, tcp_connect_timeout=None, ssl_server_dn_match=None, \
40+
ssl_server_cert_dn=None, wallet_location=None, events=None, mode=None, \
41+
disable_oob=None, stmtcachesize=None, edition=None, tag=None, matchanytag=None, \
42+
config_dir=None, appcontext=[], shardingkey=[], supershardingkey=[], debug_jdwp=None, \
43+
handle=None)
3644

3745
Sets one or more of the parameters.
3846

47+
3948
.. _connparamsattr:
4049

4150
ConnectParams Attributes

doc/src/api_manual/module.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,18 @@ Oracledb Methods
500500
The ``user``, ``password`` and ``dsn`` parameters are the same as for
501501
:meth:`oracledb.connect()`.
502502

503+
The ``pool_class`` parameter is expected to be a :ref:`ConnectionPool Object
504+
<connpool>` or a subclass of ConnectionPool.
505+
506+
The ``params`` parameter is expected to be of type :ref:`PoolParams
507+
<poolparam>` and contains parameters that are used to create the pool. If
508+
this parameter is not specified, the additional keyword arguments will be
509+
used to create an instance of PoolParams. If both the params parameter and
510+
the additional keyword parameters are specified, then an exception is
511+
raised. Note that if a ``dsn`` parameter is also specified, then the
512+
``params`` parameter will be modified to contain the connection parameters
513+
found within ``dsn``.
514+
503515
The ``min``, ``max`` and ``increment`` parameters control pool growth
504516
behavior. A fixed pool size where ``min`` equals ``max`` is
505517
:ref:`recommended <connpoolsize>` to help prevent connection storms and to
@@ -561,18 +573,6 @@ Oracledb Methods
561573
negative value, then the ping functionality will be disabled. The default
562574
value is 60 seconds.
563575

564-
The ``pool_class`` parameter is expected to be a :ref:`ConnectionPool Object
565-
<connpool>` or a subclass of ConnectionPool.
566-
567-
The ``params`` parameter is expected to be of type :ref:`PoolParams
568-
<poolparam>` and contains parameters that are used to create the pool. If
569-
this parameter is not specified, the additional keyword arguments will be
570-
used to create an instance of PoolParams. If both the params parameter and
571-
the additional keyword parameters are specified, then an exception is
572-
raised. Note that if a ``dsn`` parameter is also specified, then the
573-
``params`` parameter will be modified to contain the connection parameters
574-
found within ``dsn``.
575-
576576
The ``proxy_user`` parameter is expected to be a string which indicates the
577577
name of the proxy user to connect to. If this value is not specified, it
578578
will be parsed out of user if user is in the form "user[proxy_user]". This

doc/src/api_manual/pool_params.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,15 @@ PoolParams Methods
3232
which is looked up in ``tnsnames.ora``. Parameters that are found in the connect string
3333
override any currently stored values.
3434

35-
.. method:: PoolParams.set()
35+
.. method:: PoolParams.set(user=None, proxy_user=None, password=None, \
36+
newpassword=None, wallet_password=None, host=None, port=None, protocol=None, \
37+
https_proxy=None, https_proxy_port=None, service_name=None, sid=None, \
38+
server_type=None, cclass=None, purity=None, expire_time=None, retry_count=None, \
39+
retry_delay=None, tcp_connect_timeout=None, ssl_server_dn_match=None, \
40+
ssl_server_cert_dn=None, wallet_location=None, events=None, mode=None, \
41+
disable_oob=None, stmtcachesize=None, edition=None, tag=None, matchanytag=None, \
42+
config_dir=None, appcontext=[], shardingkey=[], supershardingkey=[], debug_jdwp=None, \
43+
handle=None)
3644

3745
Sets one or more of the parameters.
3846

doc/src/release_notes.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ oracledb 1.0 (May 2022)
1212
-----------------------
1313

1414
#) Renamed cx_Oracle to python-oracledb. See :ref:`upgradecomparison`.
15-
#) Introduced a 'Thin' mode that connects directly to Oracle Database without
16-
needing Oracle Client libraries. Thin mode is the default. To use Thick
17-
mode, see :ref:`enablingthick`.
15+
#) Python-oracledb is a 'Thin' driver by default that connects directly
16+
to Oracle Database. Optional use of Oracle Client libraries enables a
17+
:ref:`'Thick' mode <enablingthick>` with some additional functionality.
18+
Both modes support the Python Database API v2.0 Specification.
1819
#) Added a :attr:`Connection.thin` attribute which shows whether the
1920
connection was established in the python-oracledb Thin mode or Thick mode.
2021
#) Creating connections or connection pools now requires :ref:`keyword

0 commit comments

Comments
 (0)