Update defaults to 19c and XE 18c defaults.

anthony-tuininga · anthony-tuininga · commit bb84eecc5cb0 · 2019-08-12T21:19:19.000-06:00
diff --git a/doc/src/api_manual/module.rst b/doc/src/api_manual/module.rst
@@ -1324,7 +1324,7 @@ This allows you to use the exceptions for example in the following way:
 
     import cx_Oracle
 
-    connection = cx_Oracle.connect("cx_Oracle/dev@localhost/orclpdb")
+    connection = cx_Oracle.connect("cx_Oracle/dev@localhost/orclpdb1")
     cursor = connection.cursor()
 
     try:
diff --git a/doc/src/user_guide/installation.rst b/doc/src/user_guide/installation.rst
@@ -86,8 +86,8 @@ Quick Start cx_Oracle Installation
 
 	import cx_Oracle
 
-	# Connect as user "hr" with password "welcome" to the "orclpdb" service running on this computer.
-	connection = cx_Oracle.connect("hr", "welcome", "localhost/orclpdb")
+	# Connect as user "hr" with password "welcome" to the "orclpdb1" service running on this computer.
+	connection = cx_Oracle.connect("hr", "welcome", "localhost/orclpdb1")
 
 	cursor = connection.cursor()
 	cursor.execute("""
diff --git a/samples/SampleEnv.py b/samples/SampleEnv.py
@@ -29,7 +29,7 @@
 #   [//]host_name[:port][/service_name][:server_type][/instance_name]
 #
 # Commonly just the host_name and service_name are needed
-# e.g. "localhost/orclpdb1" or "localhost/XE"
+# e.g. "localhost/orclpdb1" or "localhost/XEPDB1"
 #
 # If using a tnsnames.ora file, the file can be in a default
 # location such as $ORACLE_HOME/network/admin/tnsnames.ora or
diff --git a/test/TestEnv.py b/test/TestEnv.py
@@ -33,7 +33,7 @@
 #   [//]host_name[:port][/service_name][:server_type][/instance_name]
 #
 # Commonly just the host_name and service_name are needed
-# e.g. "localhost/orclpdb" or "localhost/XE"
+# e.g. "localhost/orclpdb1" or "localhost/XEPDB1"
 #
 # If using a tnsnames.ora file, the file can be in a default
 # location such as $ORACLE_HOME/network/admin/tnsnames.ora or
@@ -58,7 +58,7 @@
 # default values
 DEFAULT_MAIN_USER = "pythontest"
 DEFAULT_PROXY_USER = "pythontestproxy"
-DEFAULT_CONNECT_STRING = "localhost/orclpdb"
+DEFAULT_CONNECT_STRING = "localhost/orclpdb1"
 
 # dictionary containing all parameters; these are acquired as needed by the
 # methods below (which should be used instead of consulting this dictionary

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`# [//]host_name[:port][/service_name][:server_type][/instance_name]`
`30`	`30`	`#`
`31`	`31`	`# Commonly just the host_name and service_name are needed`
`32`		`-# e.g. "localhost/orclpdb1" or "localhost/XE"`
	`32`	`+# e.g. "localhost/orclpdb1" or "localhost/XEPDB1"`
`33`	`33`	`#`
`34`	`34`	`# If using a tnsnames.ora file, the file can be in a default`
`35`	`35`	`# location such as $ORACLE_HOME/network/admin/tnsnames.ora or`