From 7b09fda88609afb68426bbcf6f6d8a8f238a1b78 Mon Sep 17 00:00:00 2001
From: Gerald Venzl <gerald.venzl@gmail.com>
Date: Thu, 23 Nov 2023 14:42:52 -0500
Subject: [PATCH] Upgrade to Oracle Database 23c Free

### Description
This PR updates the unittest ReadMe and `setup.cfg` to use Oracle Database Free, the successor to Oracle Database XE.

### Checklist

This pull request is:

- [ ] A documentation / typographical / small typing error fix
	- Good to go, no issue or tests are needed
- [ ] A short code fix
	- please include the issue number, and create an issue if none exists, which
	  must include a complete example of the issue.  one line code fixes without an
	  issue and demonstration will not be accepted.
	- Please include: `Fixes: #<issue number>` in the commit message
	- please include tests.   one line code fixes without tests will not be accepted.
- [ ] A new feature implementation
	- please include the issue number, and create an issue if none exists, which must
	  include a complete example of how the feature would look.
	- Please include: `Fixes: #<issue number>` in the commit message
	- please include tests.

**Have a nice day!**

Closes: #10658
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/10658
Pull-request-sha: 1cfb2d3a7f688a4b887182d2485b7d60f12eb013

Change-Id: Id37f6607572c1fdb12d507cd9336800d4d8b0cf3
(cherry picked from commit 44771ab0c32730d1ecefac21af13f113b1b19726)
---
 README.unittests.rst | 12 ++++++------
 setup.cfg            |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.unittests.rst b/README.unittests.rst
index 9cf309d2d7..57c6d42dad 100644
--- a/README.unittests.rst
+++ b/README.unittests.rst
@@ -307,11 +307,11 @@ be used with pytest by using ``--db docker_mssql``.
 **Oracle configuration**::
 
     # create the container with the proper configuration for sqlalchemy
-    docker run --rm --name oracle -p 127.0.0.1:1521:1521 -d -e ORACLE_PASSWORD=tiger -e ORACLE_DATABASE=test -e APP_USER=scott -e APP_USER_PASSWORD=tiger gvenzl/oracle-xe:21-slim
+    docker run --rm --name oracle -p 127.0.0.1:1521:1521 -d -e ORACLE_PASSWORD=tiger -e ORACLE_DATABASE=test -e APP_USER=scott -e APP_USER_PASSWORD=tiger gvenzl/oracle-free:23-slim
 
     # enter the database container and run the command
     docker exec -ti oracle bash
-    >> sqlplus system/tiger@//localhost/XEPDB1 <<EOF
+    >> sqlplus system/tiger@//localhost/FREEPDB1 <<EOF
     CREATE USER test_schema IDENTIFIED BY tiger;
     GRANT DBA TO SCOTT;
     GRANT CREATE TABLE TO scott;
@@ -319,16 +319,16 @@ be used with pytest by using ``--db docker_mssql``.
     GRANT UNLIMITED TABLESPACE TO scott;
     GRANT UNLIMITED TABLESPACE TO test_schema;
     GRANT CREATE SESSION TO test_schema;
-    CREATE PUBLIC DATABASE LINK test_link CONNECT TO scott IDENTIFIED BY tiger USING 'XEPDB1';
-    CREATE PUBLIC DATABASE LINK test_link2 CONNECT TO test_schema IDENTIFIED BY tiger USING 'XEPDB1';
+    CREATE PUBLIC DATABASE LINK test_link CONNECT TO scott IDENTIFIED BY tiger USING 'FREEPDB1';
+    CREATE PUBLIC DATABASE LINK test_link2 CONNECT TO test_schema IDENTIFIED BY tiger USING 'FREEPDB1';
     EOF
 
     # To stop the container. It will also remove it.
     docker stop oracle
 
 NOTE: with this configuration the url to use is
-``oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=XEPDB1``.  It can
-be used with pytest by using ``--dburi oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=XEPDB1``.
+``oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=FREEPDB1``.  It can
+be used with pytest by using ``--dburi oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=FREEPDB1``.
 
 CONFIGURING LOGGING
 -------------------
diff --git a/setup.cfg b/setup.cfg
index c0be17a7b7..c8594c1788 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -136,13 +136,13 @@ requirement_cls = test.requirements:DefaultRequirements
 profile_file = test/profiles.txt
 
 # name of a "loopback" link set up on the oracle database.
-# to create this, suppose your DB is scott/tiger@xe.  You'd create it
+# to create this, suppose your DB is scott/tiger@free.  You'd create it
 # like:
 # create public database link test_link connect to scott identified by tiger
-# using 'xe';
+# using 'free';
 oracle_db_link = test_link
 # create public database link test_link2 connect to test_schema identified by tiger
-# using 'xe';
+# using 'free';
 oracle_db_link2 = test_link2
 
 # host name of a postgres database that has the postgres_fdw extension.
@@ -185,4 +185,4 @@ docker_mssql = mssql+pyodbc://scott:tiger^5HHH@127.0.0.1:1433/test?driver=ODBC+D
 oracle = oracle+cx_oracle://scott:tiger@oracle18c/xe
 cxoracle = oracle+cx_oracle://scott:tiger@oracle18c/xe
 oracledb = oracle+oracledb://scott:tiger@oracle18c/xe
-docker_oracle = oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=XEPDB1
+docker_oracle = oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=FREEPDB1
-- 
2.47.2