Add a connect string for PDB support (smtaylor)

Author: cjbj

README.md

@@ -47,7 +47,7 @@ no pull requests for changes can be accepted.*
 accounts named HR, OE, PM, IX, SH or BI.
 
 The installation scripts are designed to run on a database host with
-Oracle Database 12.1, non CDB.  Privileged database access is required
+Oracle Database 12.1.  Privileged database access is required
 during installation.
 
 The instructions below work on Linux and similar operating systems.
@@ -117,8 +117,8 @@ Start SQL*Plus and run the top level installation script as
 discussed in [README.txt](#README.txt):
 
 ```shell
-sqlplus system/systempw
-@mksample systempw syspw hrpw oepw pmpw ixpw shpw bipw users temp /your/path/to/log/
+sqlplus system/systempw@connect_string
+@mksample systempw syspw hrpw oepw pmpw ixpw shpw bipw users temp /your/path/to/log/ connect_string
 ```
 
 *Note*: Use an absolute path and also append a trailing slash to the log directory name.
@@ -128,6 +128,13 @@ default and temporary tablespace names.  The passwords for the new
 HR, OE, PM, IX, SH and BI users will be set to the values you
 specify.
 
+Using a connect string permits connections to non-container databases and 
+pluggable database using the same syntax.
+
+An example of connect strings for databases with services noncdb and pdb:
+  localhost:1521/noncdb
+  localhost:1521/pdb
+
 ### 2.7. Review the installation logs
 
 Review output in your log directory for errors.
@@ -145,8 +152,8 @@ source /usr/local/bin/oraenv
 ### 3.2. Run the schema removal script
 
 ```shell
-sqlplus system/systempw 
+sqlplus system/systempw@connect_string
 @drop_sch.sql
 ```
 
-When prompted, enter the SYSTEM password and a log file name.
+When prompted, enter the SYSTEM password, a log file name, and connect string.

README.txt

@@ -2,7 +2,7 @@ README.txt
 
 Created 25-NOV-2003
 
-Updated 25-FEB-2013
+Updated 19-Mar-2015
 
 Copyright (c) 2015 Oracle
 
@@ -117,15 +117,27 @@ provides instructions for creating the Sample Schemas.
 		log file directory: $ORACLE_HOME/demo/schema/log
 
         NOTE: Use your own passwords.
+
+2.3     Verify the connect string for the database. For illustration 
+        purposes, the value of <connect_string> for database pdb is:
+
+                connect_string: localhost:1521/pdb
 
 
-2.3	Invoke the Sample Schema creation script. Using the values listed 
-	in Sections 2.1 and 2.2, the command would look like this:
+        The connect_string may also be a valid tnsnames.ora entry.
+
+        NOTE: Due to referencing external tables under the sample
+              schema directory, the sample schema files must be
+              extracted on and mksample executed on the host 
+              containing the database.
+
+2.4	Invoke the Sample Schema creation script. Using the values listed 
+	in Sections 2.1, 2.2, and 2.3 the command would look like this:
 
 	SQL> @?/demo/schema/mksample <SYSTEM_password> <SYS_password>
  		<HR_password> <OE_password> <PM_password> <IX_password> 
 		<SH_password> <BI_password> EXAMPLE TEMP 
-		$ORACLE_HOME/demo/schema/log/
+		$ORACLE_HOME/demo/schema/log/ localhost:1521/pdb
 
 	The mksample script lists all the objects created in the data dictionary.  
 
@@ -150,10 +162,3 @@ provides instructions for creating the Sample Schemas.
 
 ========================================================================
 
-4.  Known bugs
- 
-4.1 The Sample Schema scripts do not work with pluggable databases.
-
-========================================================================
-
-

bus_intelligence/bi_main.sql

@@ -1,4 +1,4 @@
-Rem $Header: rdbms/demo/schema/bus_intelligence/bi_main.sql /main/6 2011/05/27 08:25:53 jmadduku Exp $
+Rem $Header: rdbms/demo/schema/bus_intelligence/bi_main.sql /main/7 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem Copyright (c) 2002, 2015, Oracle and/or its affiliates.  All rights reserved. 
 Rem 
@@ -29,6 +29,9 @@ Rem    DESCRIPTION
 Rem      tbd
 Rem
 Rem    MODIFIED     (MM/DD/YY)
+Rem      smtaylor    03/19/15 - added parameter 9, connect string
+Rem      smtaylor    03/19/15 - added @&connect_string to CONNECT
+Rem      smtaylor    03/19/15 - added pararmeter &connect_string to script calls
 Rem      jmadduku    02/18/11 - Grant Unlimited Tablespace priv with RESOURCE
 Rem      cbauwens    02/23/05 - deprocating connect role 
 Rem      ahunold     05/07/03 - no COMPANY_ID
@@ -75,14 +78,17 @@ PROMPT
 PROMPT specify version as parameter 8:
 DEFINE vrs = &8
 PROMPT
+PROMPT specify connect string as parameter 9:
+DEFINE connect_string     = &9
+PROMPT
 
 -- The first dot in the spool command below is 
 -- the SQL*Plus concatenation character
 
 DEFINE spool_file = &log_path.bi_&vrs..log
 SPOOL &spool_file
 
-CONNECT sys/&pwd_sys AS SYSDBA;
+CONNECT sys/&pwd_sys@&connect_string AS SYSDBA;
 
 REM =======================================================
 REM cleanup section
@@ -120,20 +126,20 @@ REM  Changes made as OE
 REM     Grant object privileges to BI
 REM =======================================================
 
-@__SUB__CWD__/bus_intelligence/bi_oe_pr.sql &pwd_oe
+@__SUB__CWD__/bus_intelligence/bi_oe_pr.sql &pwd_oe &connect_string
 
 REM =======================================================
 REM  Changes made as SH 
 REM     Grant object privileges to BI
 REM =======================================================
 
-@__SUB__CWD__/bus_intelligence/bi_sh_pr.sql &pwd_sh
+@__SUB__CWD__/bus_intelligence/bi_sh_pr.sql &pwd_sh &connect_string
 
 REM =======================================================
 REM  Views and synonyms in the 10i BI schema
 REM =======================================================
 
-@__SUB__CWD__/bus_intelligence/bi_views.sql &pwd_bi
+@__SUB__CWD__/bus_intelligence/bi_views.sql &pwd_bi &connect_string
 
 REM =======================================================
 REM  Verification
@@ -143,7 +149,7 @@ SET ECHO ON
 COLUMN TABLE_NAME FORMAT A25
 COLUMN COLUMN_NAME FORMAT A30
 
-CONNECT bi/&pwd_bi;
+CONNECT bi/&pwd_bi@&connect_string;
 
 SELECT COUNT(*) FROM customers;
 SELECT COUNT(*) FROM products;

bus_intelligence/bi_oe_pr.sql

@@ -1,4 +1,4 @@
-Rem $Header: bi_oe_pr.sql 18-sep-2002.10:15:02 ahunold Exp $
+Rem $Header: bi_oe_pr.sql 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem Copyright (c) 2002, 2015 Oracle Corporation.  All rights reserved.  
 Rem 
@@ -28,6 +28,8 @@ Rem    DESCRIPTION
 Rem      tbd
 Rem
 Rem    MODIFIED     (MM/DD/YY)
+Rem      smtaylor    03/19/15 - added parameter 2, connect string
+Rem      smtaylor    03/19/15 - added @&connect_string to CONNECT
 Rem      ahunold     09/18/02 - ahunold_sep17_02
 Rem      ahunold     09/17/02 - created
 Rem
@@ -42,10 +44,12 @@ SET PAGESIZE 100
 PROMPT
 PROMPT specify password for oe as parameter 1:
 DEFINE oe_pass             = &1
-
+PROMPT
+PROMPT specify connect string as parameter 2:
+DEFINE connect_string     = &2
 PROMPT
 
-CONNECT oe/&oe_pass;
+CONNECT oe/&oe_pass@&connect_string;
 
 GRANT SELECT ON BOMBAY_INVENTORY TO bi;
 GRANT SELECT ON CUSTOMERS TO bi;

bus_intelligence/bi_sh_pr.sql

@@ -1,4 +1,4 @@
-Rem $Header: bi_sh_pr.sql 18-sep-2002.10:15:02 ahunold Exp $
+Rem $Header: bi_sh_pr.sql 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem Copyright (c) 2002, 2015 Oracle Corporation.  All rights reserved.  
 Rem 
@@ -28,6 +28,8 @@ Rem    DESCRIPTION
 Rem      tbd
 Rem
 Rem    MODIFIED     (MM/DD/YY)
+Rem      smtaylor    03/19/15 - added parameter 2, connect_string
+Rem      smtaylor    03/19/15 - added @&connect_string to CONNECT
 Rem      ahunold     09/18/02 - ahunold_sep17_02
 Rem      ahunold     09/17/02 - created
 Rem
@@ -43,8 +45,11 @@ PROMPT
 PROMPT specify password for SH as parameter 1:
 DEFINE sh_pass             = &1
 PROMPT
+PROMPT specify connect string as parameter 2:
+DEFINE connect_string     = &2
+PROMPT
 
-CONNECT sh/&sh_pass;
+CONNECT sh/&sh_pass@&connect_string;
 
 GRANT SELECT ON channels		TO bi;
 GRANT SELECT ON countries		TO bi;

bus_intelligence/bi_views.sql

@@ -1,4 +1,4 @@
-Rem $Header: bi_views.sql 07-may-2003.10:15:44 ahunold Exp $
+Rem $Header: bi_views.sql 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem Copyright (c) 2002, 2015, Oracle Corporation.  All rights reserved.  
 Rem 
@@ -28,6 +28,8 @@ Rem    DESCRIPTION
 Rem      tbd
 Rem
 Rem    MODIFIED     (MM/DD/YY)
+Rem      smtaylor    03/19/15 - added parameter 2, connect_string
+Rem      smtaylor    03/19/15 - added @&connect_string to CONNECT
 Rem      ahunold     05/07/03 - no COMPANY_ID
 Rem      ahunold     09/18/02 - ahunold_sep17_02
 Rem      ahunold     09/17/02 - created
@@ -44,8 +46,11 @@ PROMPT
 PROMPT specify password for BI as parameter 1:
 DEFINE bi_pass             = &1
 PROMPT
+PROMPT specify connect string as parameter 2:
+DEFINE connect_string     = &2
+PROMPT
 
-CONNECT bi/&bi_pass;
+CONNECT bi/&bi_pass@&connect_string;
 
 CREATE SYNONYM channels		FOR sh.channels;
 CREATE SYNONYM countries	FOR sh.countries;

drop_sch.sql

@@ -1,5 +1,5 @@
 Rem
-Rem $Header: rdbms/demo/schema/drop_sch.sql /main/1 2009/04/03 15:56:48 cbauwens Exp $
+Rem $Header: rdbms/demo/schema/drop_sch.sql /main/2 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem drop_sch.sql
 Rem
@@ -40,6 +40,8 @@ Rem               named HR,OE,IX,PM,SH
 Rem
 Rem
 Rem    MODIFIED   (MM/DD/YY)
+Rem    smtaylor    03/19/15 - added parameter 3, connect string
+Rem    smtaylor    03/19/15 - added @&connect_string to CONNECT
 Rem    cbauwens    03/05/09 - Drop Sample Schemas
 Rem    cbauwens    03/05/09 - Created
 Rem
@@ -69,7 +71,12 @@ PROMPT specify spoolfile name:
 DEFINE spl_file
 PROMPT 
 
-CONNECT system/&pwd_system
+PROMPT specify connect string:
+DEFINE connect_string
+PROMPT
+
+
+CONNECT system/&pwd_system@&connect_string
 SPOOL &spl_file
 
 Rem ******** List schemas and objects ********

human_resources/hr_drop.sql

@@ -1,5 +1,5 @@
 Rem
-Rem $Header: hr_drop.sql 29-aug-2002.11:44:07 hyeh Exp $
+Rem $Header: hr_drop.sql 2015/03/19 10:23:26 smtaylor Exp $
 Rem
 Rem hr_drop.sql
 Rem
@@ -34,6 +34,8 @@ Rem    NOTES
 Rem
 Rem    CREATED by Nancy Greenberg - 06/01/00
 Rem    MODIFIED   (MM/DD/YY)
+Rem    smtaylor    03/19/15 - added parameter 2, connect_string
+Rem    smtaylor    03/19/15 - added @&connect_string to CONNECT
 Rem    hyeh        08/29/02 - hyeh_mv_comschema_to_rdbms
 Rem    ahunold     02/20/01 - New header, non-table objects
 Rem    vpatabal    03/02/01 - DROP TABLE region 
@@ -46,7 +48,7 @@ SET TAB OFF
 SET PAGESIZE 100
 SET ECHO OFF
 
-CONNECT hr/&password_HR
+CONNECT hr/&password_HR@&connect_string
 
 DROP PROCEDURE add_job_history;
 DROP PROCEDURE secure_dml;

human_resources/hr_main.sql

@@ -1,5 +1,5 @@
 rem
-rem Header: hr_main.sql 09-jan-01
+rem Header: hr_main.sql 2015/03/19 10:23:26 smtaylor Exp $
 rem
 rem Copyright (c) 2001, 2015, Oracle and/or its affiliates.  All rights reserved. 
 rem 
@@ -35,6 +35,8 @@ rem NOTES
 rem   Run as SYS or SYSTEM
 rem
 rem MODIFIED   (MM/DD/YY)
+rem   smtaylor  03/19/15 - added parameter 6, connect_string
+rem   smtaylor  03/19/15 - added @&connect_string to CONNECT
 rem   jmadduku  02/18/11 - Grant Unlimited Tablespace priv with RESOURCE
 rem   celsbern  06/17/10 - fixing bug 9733839
 rem   pthornto  07/16/04 - obsolete 'connect' role 
@@ -67,6 +69,9 @@ PROMPT
 PROMPT specify log path as parameter 5:
 DEFINE log_path = &5
 PROMPT
+PROMPT specify connect string as parameter 6:
+DEFINE connect_string     = &6
+PROMPT
 
 -- The first dot in the spool command below is 
 -- the SQL*Plus concatenation character
@@ -101,14 +106,14 @@ REM =======================================================
 REM grants from sys schema
 REM =======================================================
 
-CONNECT sys/&pass_sys AS SYSDBA;
+CONNECT sys/&pass_sys@&connect_string AS SYSDBA;
 GRANT execute ON sys.dbms_stats TO hr;
 
 REM =======================================================
 REM create hr schema objects
 REM =======================================================
 
-CONNECT hr/&pass
+CONNECT hr/&pass@&connect_string
 ALTER SESSION SET NLS_LANGUAGE=American;
 ALTER SESSION SET NLS_TERRITORY=America;