diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-09 15:32:25 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-09 15:32:25 +0200 |
| commit | 416f360a19118c4692e430f0a1f5d12f81876ee7 (patch) | |
| tree | 5eaebb3c25f5665bee71a2f4283e949bb7614ae0 /user_guide_src/source | |
| parent | 2271874d9c2bb4d5959f4287dea3c7c3b5b0c732 (diff) | |
Fix changelog merge conflict
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 6b47437d6..8146a5139 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -90,15 +90,11 @@ Release Date: Not Released - num_rows() is now only called explicitly by the developer and no longer re-executes statements. - Added replace() support for SQLite. - Renamed internal method _escape_identifiers() to escape_identifiers(). -<<<<<<< HEAD - - CUBRID driver's utility class now overrides list_databases() in order to use cubrid_list_dbs(). -======= - Added SQLite support for drop_table() in :doc:`Database Forge <database/forge>`. - Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge <database/forge>`. - Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge <database/forge>`. - Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility <database/utilities>`. - Improved CUBRID support for list_databases() in :doc:`Database Utility <database/utilities>` (until now only the currently used database was returned). ->>>>>>> 918be7963f6fa3461d612ea7ca4c9774c12f9da5 - Libraries |