Skip to content

Commit 41693a2

Browse files
Further documentation improvements in preparation for release.
1 parent c31d791 commit 41693a2

File tree

9 files changed

+204
-156
lines changed

9 files changed

+204
-156
lines changed

doc/src/api_manual/async_connection.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,10 @@ AsyncConnection Attributes
527527
528528
.. attribute:: AsyncConnection.max_identifier_length
529529

530-
This read-only attribute specifies the maximum length of bytes supported by
531-
the database to which the connection has been established. See `Database
532-
Object Naming Rules <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
530+
This read-only attribute specifies the maximum database identifier length
531+
in bytes supported by the database to which the connection has been
532+
established. See `Database Object Naming Rules
533+
<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
533534
id=GUID-75337742-67FD-4EC0-985F-741C93D918DA>`__.
534535

535536
.. versionadded:: 2.5.0

doc/src/api_manual/connect_params.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ ConnectParams Methods
7070
.. versionchanged:: 2.5.0
7171

7272
The ``program``, ``machine``, ``terminal``, ``osuser``, and
73-
``driver_name`` parameters were added.
73+
``driver_name`` parameters were added. Support for ``edition`` and
74+
``appcontext`` was added to python-oracledb Thin mode.
7475

7576
.. versionchanged:: 2.3.0
7677

doc/src/api_manual/connection.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -756,9 +756,10 @@ Connection Attributes
756756
757757
.. attribute:: Connection.max_identifier_length
758758

759-
This read-only attribute specifies the maximum length of bytes supported
760-
by the database to which the connection has been established. See `Database
761-
Object Naming Rules <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
759+
This read-only attribute specifies the maximum database identifier length
760+
in bytes supported by the database to which the connection has been
761+
established. See `Database Object Naming Rules
762+
<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
762763
id=GUID-75337742-67FD-4EC0-985F-741C93D918DA>`__.
763764

764765
.. versionadded:: 2.5.0
@@ -834,10 +835,10 @@ Connection Attributes
834835

835836
.. attribute:: Connection.serial_num
836837

837-
This read-only attribute specifies the session serial number associated with
838-
the connection. It is the same value returned by the SQL
839-
``SELECT SERIAL# FROM V$SESSION``. It is available only in python-oracledb
840-
Thin mode.
838+
This read-only attribute specifies the session serial number associated
839+
with the connection. It is the same value returned by the SQL
840+
``SELECT SERIAL# FROM V$SESSION WHERE SID=SYS_CONTEXT('USERENV', 'SID')``.
841+
It is available only in python-oracledb Thin mode.
841842

842843
.. versionadded:: 2.5.0
843844

@@ -867,8 +868,8 @@ Connection Attributes
867868

868869
This read-only attribute specifies the session identifier associated with
869870
the connection. It is the same value returned by the SQL
870-
``SELECT SID FROM V$SESSION``. It is available only in python-oracledb
871-
Thin mode.
871+
``SELECT SYS_CONTEXT('USERENV', 'SID') FROM DUAL``. It is available
872+
only in python-oracledb Thin mode.
872873

873874
.. versionadded:: 2.5.0
874875

doc/src/api_manual/module.rst

Lines changed: 75 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@ Oracledb Methods
436436

437437
This method can only be used in python-oracledb Thin mode.
438438

439+
When connecting to Oracle Autonomous Database, use Python 3.11, or later.
440+
439441
.. versionadded:: 2.0.0
440442

441443
Some values, such as the database host name, can be specified as
@@ -1026,7 +1028,8 @@ Oracledb Methods
10261028
.. versionchanged:: 2.5.0
10271029

10281030
The ``program``, ``machine``, ``terminal``, ``osuser``, and
1029-
``driver_name`` parameters were added.
1031+
``driver_name`` parameters were added. Support for ``edition`` and
1032+
``appcontext`` was added to python-oracledb Thin mode.
10301033

10311034
.. versionchanged:: 2.3.0
10321035

@@ -1378,8 +1381,7 @@ Oracledb Methods
13781381
The ``appcontext`` parameter is expected to be a list of 3-tuples that
13791382
identifies the application context used by the connection. This parameter
13801383
should contain namespace, name, and value and each entry in the tuple
1381-
should be a string. This value is only used in the python-oracledb Thick
1382-
mode and is ignored in the Thin mode.
1384+
should be a string.
13831385

13841386
The ``shardingkey`` parameter and ``supershardingkey`` parameters, if
13851387
specified, are expected to be a sequence of values which identifies the
@@ -1544,6 +1546,8 @@ Oracledb Methods
15441546

15451547
This method can only be used in python-oracledb Thin mode.
15461548

1549+
When connecting to Oracle Autonomous Database, use Python 3.11, or later.
1550+
15471551
.. versionadded:: 2.0.0
15481552

15491553
Some values, such as the database host name, can be specified as
@@ -2301,8 +2305,7 @@ Oracledb Methods
23012305
The ``appcontext`` parameter is expected to be a list of 3-tuples that
23022306
identifies the application context used by the connection. This parameter
23032307
should contain namespace, name, and value and each entry in the tuple
2304-
should be a string. This value is only used inthe python-oracledb Thick
2305-
mode.
2308+
should be a string.
23062309

23072310
The ``shardingkey`` parameter and ``supershardingkey`` parameters, if
23082311
specified, are expected to be a sequence of values which identifies the
@@ -2411,7 +2414,8 @@ Oracledb Methods
24112414
.. versionchanged:: 2.5.0
24122415

24132416
The ``program``, ``machine``, ``terminal``, ``osuser``, and
2414-
``driver_name`` parameters were added.
2417+
``driver_name`` parameters were added. Support for ``edition`` and
2418+
``appcontext`` was added to python-oracledb Thin mode.
24152419

24162420
.. versionchanged:: 2.3.0
24172421

@@ -2872,8 +2876,8 @@ definition.
28722876
python-oracledb Thin mode, and for standalone connections in the Thick
28732877
mode.
28742878

2875-
This constant deprecates the ``DEFAULT_AUTH`` constant that was used in
2876-
cx_Oracle 8.3.
2879+
This constant deprecates the ``DEFAULT_AUTH`` constant that was used in
2880+
cx_Oracle 8.3, and was the default ``mode`` value.
28772881

28782882
.. data:: AUTH_MODE_PRELIM
28792883

@@ -2888,8 +2892,8 @@ definition.
28882892
This constant can only be used in the python-oracledb Thick mode for
28892893
standalone connections.
28902894

2891-
This constant deprecates the ``PRELIM_AUTH`` constant that was used in
2892-
cx_Oracle 8.3.
2895+
This constant deprecates the ``PRELIM_AUTH`` constant that was used in
2896+
cx_Oracle 8.3.
28932897

28942898
.. data:: AUTH_MODE_SYSASM
28952899

@@ -2904,8 +2908,8 @@ definition.
29042908
python-oracledb Thin mode, and for standalone connections in the Thick
29052909
mode.
29062910

2907-
This constant deprecates the ``SYSASM`` constant that was used in
2908-
cx_Oracle 8.3.
2911+
This constant deprecates the ``SYSASM`` constant that was used in
2912+
cx_Oracle 8.3.
29092913

29102914
.. data:: AUTH_MODE_SYSBKP
29112915

@@ -2920,8 +2924,8 @@ definition.
29202924
python-oracledb Thin mode, and for standalone connections in the Thick
29212925
mode.
29222926

2923-
This constant deprecates the ``SYSBKP`` constant that was used in
2924-
cx_Oracle 8.3.
2927+
This constant deprecates the ``SYSBKP`` constant that was used in
2928+
cx_Oracle 8.3.
29252929

29262930
.. data:: AUTH_MODE_SYSDBA
29272931

@@ -2936,8 +2940,8 @@ definition.
29362940
python-oracledb Thin mode, and for standalone connections in the Thick
29372941
mode.
29382942

2939-
This constant deprecates the ``SYSDBA`` constant that was used in
2940-
cx_Oracle 8.3.
2943+
This constant deprecates the ``SYSDBA`` constant that was used in
2944+
cx_Oracle 8.3.
29412945

29422946
.. data:: AUTH_MODE_SYSDGD
29432947

@@ -2952,8 +2956,8 @@ definition.
29522956
python-oracledb Thin mode, and for standalone connections in the Thick
29532957
mode.
29542958

2955-
This constant deprecates the ``SYSDGD`` constant that was used in
2956-
cx_Oracle 8.3.
2959+
This constant deprecates the ``SYSDGD`` constant that was used in
2960+
cx_Oracle 8.3.
29572961

29582962
.. data:: AUTH_MODE_SYSKMT
29592963

@@ -2968,8 +2972,8 @@ definition.
29682972
python-oracledb Thin mode, and for standalone connections in the Thick
29692973
mode.
29702974

2971-
This constant deprecates the ``SYSKMT`` constant that was used in
2972-
cx_Oracle 8.3.
2975+
This constant deprecates the ``SYSKMT`` constant that was used in
2976+
cx_Oracle 8.3.
29732977

29742978
.. data:: AUTH_MODE_SYSOPER
29752979

@@ -2984,8 +2988,8 @@ definition.
29842988
python-oracledb Thin mode, and for standalone connections in the Thick
29852989
mode.
29862990

2987-
This constant deprecates the ``SYSOPER`` constant that was used in
2988-
cx_Oracle 8.3.
2991+
This constant deprecates the ``SYSOPER`` constant that was used in
2992+
cx_Oracle 8.3.
29892993

29902994
.. data:: AUTH_MODE_SYSRAC
29912995

@@ -3000,8 +3004,8 @@ definition.
30003004
python-oracledb Thin mode, and for standalone connections in the Thick
30013005
mode.
30023006

3003-
This constant deprecates the ``SYSRAC`` constant that was used in
3004-
cx_Oracle 8.3.
3007+
This constant deprecates the ``SYSRAC`` constant that was used in
3008+
cx_Oracle 8.3.
30053009

30063010
.. _pipeline-operation-types:
30073011

@@ -3243,82 +3247,88 @@ Connection Pool Get Modes
32433247
-------------------------
32443248

32453249
These constants belong to the enumeration called ``PoolGetMode``. They are
3246-
possible values for the ``getmode`` parameter of
3247-
:meth:`oracledb.create_pool()` and :meth:`oracledb.create_pool_async()`. They
3248-
have deprecated the Session Pool mode constants that were used in cx_Oracle
3249-
8.3. The constants are extensions to the DB API definition.
3250+
possible values for the ``getmode`` parameters of
3251+
:meth:`oracledb.create_pool()`, :meth:`oracledb.create_pool_async()`,
3252+
:meth:`PoolParams.set()`, and for related attributes. They have deprecated the
3253+
Session Pool mode constants that were used in cx_Oracle 8.3. The constants are
3254+
extensions to the DB API definition
32503255

32513256
.. versionchanged:: 2.3.0
32523257

3253-
The integer constants for the connection pool get modes were replaced
3254-
with the enumeration ``PoolGetMode``.
3258+
The integer constants for the connection pool creation, reconfiguration,
3259+
and acquisition ``getmode`` parameters were replaced with the enumeration
3260+
``PoolGetMode``.
32553261

32563262
.. data:: POOL_GETMODE_FORCEGET
32573263

3258-
This constant is used to specify that a new connection will be returned if
3259-
there are no free sessions available in the pool.
3264+
This constant is used to specify that a new connection should be created
3265+
and returned by :meth:`ConnectionPool.acquire()` if there are no free
3266+
connections available in the pool and the pool is already at its maximum
3267+
size.
3268+
3269+
When a connection acquired in this mode is eventually released back to the
3270+
pool, it will be dropped and not added to the pool if the pool is still at
3271+
its maximum size.
32603272

32613273
This enumerated value can also be identified by
32623274
``oracledb.PoolGetMode.FORCEGET``.
32633275

3264-
.. note::
3265-
3266-
This constant deprecates the ``SPOOL_ATTRVAL_FORCEGET`` constant that
3267-
was used in cx_Oracle 8.3.
3276+
This constant deprecates the ``SPOOL_ATTRVAL_FORCEGET`` constant that was
3277+
used in cx_Oracle 8.3.
32683278

32693279

32703280
.. data:: POOL_GETMODE_NOWAIT
32713281

3272-
This constant is used to specify that an exception should be raised if
3273-
there are no free sessions available in the pool.
3282+
This constant is used to specify that an exception should be raised by
3283+
:meth:`ConnectionPool.acquire()` when all currently created connections are
3284+
already in use and so :meth:`~ConnectionPool.acquire()` cannot immediately
3285+
return a connection. Note the exception may occur even if the pool is
3286+
smaller than its maximum size.
32743287

32753288
This enumerated value can also be identified by
32763289
``oracledb.PoolGetMode.NOWAIT``.
32773290

3278-
.. note::
3279-
3280-
This constant deprecates the ``SPOOL_ATTRVAL_NOWAIT`` constant that was
3281-
used in cx_Oracle 8.3.
3291+
This constant deprecates the ``SPOOL_ATTRVAL_NOWAIT`` constant that was
3292+
used in cx_Oracle 8.3, and was the default ``getmode`` value.
32823293

32833294

32843295
.. data:: POOL_GETMODE_WAIT
32853296

3286-
This constant is used to specify that the caller should wait until a
3287-
session is available if there are no free sessions available in the pool.
3288-
This is the default value.
3297+
This constant is used to specify that :meth:`ConnectionPool.acquire()`
3298+
should wait until a connection is available if there are currently no free
3299+
connections available in the pool. This is the default value.
32893300

32903301
This enumerated value can also be identified by
32913302
``oracledb.PoolGetMode.WAIT``.
32923303

3293-
.. note::
3294-
3295-
This constant deprecates the ``SPOOL_ATTRVAL_WAIT`` constant that was
3296-
used in cx_Oracle 8.3.
3304+
This constant deprecates the ``SPOOL_ATTRVAL_WAIT`` constant that was
3305+
used in cx_Oracle 8.3.
32973306

32983307

32993308
.. data:: POOL_GETMODE_TIMEDWAIT
33003309

3301-
This constant is used to specify that the caller should wait for a period
3302-
of time (defined by the ``wait_timeout`` parameter) for a session to become
3303-
available before returning with an error.
3310+
This constant is used to specify that :meth:`ConnectionPool.acquire()`
3311+
should wait for a period of time (defined by the ``wait_timeout``
3312+
parameter) for a connection to become available before returning with an
3313+
error.
33043314

33053315
This enumerated value can also be identified by
33063316
``oracledb.PoolGetMode.TIMEDWAIT``.
33073317

3308-
.. note::
3309-
3310-
This constant deprecates the ``SPOOL_ATTRVAL_TIMEDWAIT`` constant that
3311-
was used in cx_Oracle 8.3.
3318+
This constant deprecates the ``SPOOL_ATTRVAL_TIMEDWAIT`` constant that was
3319+
used in cx_Oracle 8.3.
33123320

33133321
.. _drcppurityconsts:
33143322

33153323
Connection Pool Purity Constants
33163324
--------------------------------
33173325

33183326
These constants belong to the enumeration called ``Purity``. They are possible
3319-
values for the ``purity`` parameter of :meth:`connect()` used for :ref:`drcp`.
3320-
They have deprecated the Session Pool purity constants that were used in
3321-
cx_Oracle 8.3. The constants are extensions to the DB API definition.
3327+
values for the :ref:`drcp` ``purity`` parameter of
3328+
:meth:`oracledb.create_pool()`, :meth:`ConnectionPool.acquire()`, and
3329+
:meth:`oracledb.connect()`. They have deprecated the Session Pool purity
3330+
constants that were used in cx_Oracle 8.3. The constants are extensions to the
3331+
DB API definition.
33223332

33233333
.. versionchanged:: 2.3.0
33243334

@@ -3334,10 +3344,8 @@ cx_Oracle 8.3. The constants are extensions to the DB API definition.
33343344
This enumerated value can also be identified by
33353345
``oracledb.Purity.DEFAULT``.
33363346

3337-
.. note::
3338-
3339-
This constant deprecates the ``ATTR_PURITY_DEFAULT`` constant that was
3340-
used in cx_Oracle 8.3.
3347+
This constant deprecates the ``ATTR_PURITY_DEFAULT`` constant that was used
3348+
in cx_Oracle 8.3, and was the default ``purity`` value.
33413349

33423350
.. data:: PURITY_NEW
33433351

@@ -3346,10 +3354,8 @@ cx_Oracle 8.3. The constants are extensions to the DB API definition.
33463354

33473355
This enumerated value can also be identified by ``oracledb.Purity.NEW``.
33483356

3349-
.. note::
3350-
3351-
This constant deprecates the ``ATTR_PURITY_NEW`` constant that was used
3352-
in cx_Oracle 8.3.
3357+
This constant deprecates the ``ATTR_PURITY_NEW`` constant that was used in
3358+
cx_Oracle 8.3.
33533359

33543360

33553361
.. data:: PURITY_SELF
@@ -3359,10 +3365,8 @@ cx_Oracle 8.3. The constants are extensions to the DB API definition.
33593365

33603366
This enumerated value can also be identified by ``oracledb.Purity.SELF``.
33613367

3362-
.. note::
3363-
3364-
This constant deprecates the ``ATTR_PURITY_SELF`` constant that was
3365-
used in cx_Oracle 8.3.
3368+
This constant deprecates the ``ATTR_PURITY_SELF`` constant that was used in
3369+
cx_Oracle 8.3.
33663370

33673371
Subscription Grouping Classes
33683372
-----------------------------

doc/src/api_manual/pool_params.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ PoolParams Methods
5858
.. versionchanged:: 2.5.0
5959

6060
The ``program``, ``machine``, ``terminal``, ``osuser``, and ``driver_name``
61-
parameters were added.
61+
parameters were added. Support for ``edition`` and ``appcontext`` was
62+
added to python-oracledb Thin mode.
6263

6364
.. versionchanged:: 2.3.0
6465

0 commit comments

Comments
 (0)