Skip to content

Commit

Permalink
Merge pull request #186 from vrogier/develop-v4.6.0
Browse files Browse the repository at this point in the history
fixed typos and spelling errors
  • Loading branch information
vrogier authored Nov 22, 2018
2 parents 98210d8 + e703222 commit c2a4794
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

* Extended Column property flags:
- C API: extended OCI_ColumnGetPropertyFlags() with new flags OCI_CPF_IS_LPART and OCI_CPF_IS_CONID
- C++ API: Extented PropertyFlagsValues enum with IsLogicalPartitioning and IsGeneratedByContainers
- C++ API: extended PropertyFlagsValues enum with IsLogicalPartitioning and IsGeneratedByContainers

* Added the ability to retrieve the SQL_ID of an SQL statement:
- C API: added function OCI_GetSqlIdentifier()
- C++API: added function Statement::GetSqlIdentifier()

* Added the ability to find out if a CLOB/NCLOB/BLOB is remote
- C API: Added function OCI_LobIsRemote()
- C API: added function OCI_LobIsRemote()
- C++API: added function Lob<T, U>::IsRemote()

* Added network timeout management support
- C API: added functions OCI_SetTimeout() and OCI_GetTimeout()
- C API: added timeout types: OCI_NTO_SEND, OCI_NTO_RECEIVE, OCI_NTO_CALL
- C API: added functions Connection::SetTimeout() and Connection::GetTimeout()
- C API: added Connection::TimeoutTypeValues enum
- C++ API: added functions Connection::SetTimeout() and Connection::GetTimeout()
- C++ API: added Connection::TimeoutTypeValues enum

- C++ API:

Expand Down
2 changes: 1 addition & 1 deletion doxygen/Installation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Platforms: Windows, HP/UX, Linux, Mac OS, Solaris, AIX
* - Architectures: 32/64bits
* - Compilers: GCC / MinGW, MS Compilers, IBM XLC, CCs, LabView
* - Oracle versions: 8i, 9i, 10g, 11g
* - Oracle versions: 8i, 9i, 10g, 11g, 12c, 18c
*
* Please, contact the author if you have validated OCILIB on platforms or compilers not listed here.
*
Expand Down
16 changes: 8 additions & 8 deletions include/ocilib.h
Original file line number Diff line number Diff line change
Expand Up @@ -6595,17 +6595,17 @@ OCI_EXPORT boolean OCI_API OCI_ColumnGetCharUsed
* For flags are:
* - OCI_CPF_NONE : The column has no flags or the OCI client does not support this call
* - OCI_CPF_IS_IDENTITY:
* - If Set, the column is an IDENTITY column
* - Otherwise, it is not an IDENTITY column
* - If Set, the column is an IDENTITY column
* - Otherwise, it is not an IDENTITY column
* - OCI_CPF_IS_GEN_ALWAYS:
* - If set, means that the value is "ALWAYS GENERATED"
* - Otherwise mens that the value is "GENERATED BY"
* - If set, means that the value is "ALWAYS GENERATED"
* - Otherwise mens that the value is "GENERATED BY"
* - OCI_CPF_IS_GEN_BY_DEFAULT_ON_NULL:
* - If set, means that the value is generated by default on NULL
* - OCI_CPF_IS_LPART:
* - If set, Column is an implicitly generated logical partitioning column for container_map enabled object
* - If set, means that the value is generated by default on NULL
* - OCI_CPF_IS_LPART:
* - If set, Column is an implicitly generated logical partitioning column for container_map enabled object
* - OCI_CPF_IS_CONID:
* - If set, Column is a CON_ID column implicitly generated by CONTAINERS() or is an ORIGIN_CON_ID column implicitly generated for Extended Data Link
* - If set, Column is a CON_ID column implicitly generated by CONTAINERS() or is an ORIGIN_CON_ID column implicitly generated for Extended Data Link
*
* @note
* This was introduced in Oracle 12cR1.
Expand Down
4 changes: 2 additions & 2 deletions include/ocilib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2493,8 +2493,8 @@ class Connection : public HandleHolder<OCI_Connection *>
* @brief
* Set a given timeout for OCI calls that require server round-trips to the given database
*
* @param type - Type of timeout to set
* @param value - Timeout in milliseconds
* @param timeout - Type of timeout to set
* @param value - Timeout in milliseconds
*
* OCI client raises an timeout type related error when a given timeout is reached.
*
Expand Down

0 comments on commit c2a4794

Please sign in to comment.