Modified the HoL for Collaborate (#169)

Modified samples and instructions to import common connection information from db_config.py or db_config.sql in order to make setup a bit more generic.

Author: OsBlaineOra

samples/tutorial/Python-and-Oracle-Database-12c-Scripting-for-the-Future.html

@@ -10,8 +10,9 @@
 
 import cx_Oracle
 import decimal
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 BOOK_TYPE_NAME = "UDT_BOOK"

samples/tutorial/aq.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 rows = [ (1, "First" ), (2, "Second" ),

samples/tutorial/bind_insert.py

@@ -8,9 +8,18 @@
 
 set echo on
 
-connect pythonhol/welcome@localhost/orclpdb
+@@db_config.sql
+connect &user/&pw@&connect_string
 
-drop table mytab;
+begin
+  execute immediate 'drop table mytab';
+exception
+when others then
+  if sqlcode not in (-00942) then
+    raise;
+  end if;
+end;
+/
 
 create table mytab (id number, data varchar2(20), constraint my_pk primary key (id));
 

samples/tutorial/bind_insert.sql

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 cur.prepare("select * from dept where deptno = :id order by deptno")

samples/tutorial/bind_query.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+import db_config
 
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 # Create table

samples/tutorial/bind_sdo.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 print("Inserting data...")

samples/tutorial/clob.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 print("Inserting data...")

samples/tutorial/clob_string.py

@@ -9,6 +9,7 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 print("Database version:", con.version)

samples/tutorial/connect.py

@@ -9,7 +9,8 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb:pooled",
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn + ":pooled",
                         cclass="PYTHONHOL", purity=cx_Oracle.ATTR_PURITY_SELF)
 print("Database version:", con.version)

samples/tutorial/connect_drcp.py

@@ -10,8 +10,9 @@
 
 import cx_Oracle
 import threading
+import db_config
 
-pool = cx_Oracle.SessionPool("pythonhol", "welcome", "localhost/orclpdb",
+pool = cx_Oracle.SessionPool(db_config.user, db_config.pw, db_config.dsn,
                              min = 2, max = 5, increment = 1, threaded = True)
 
 def Query():

samples/tutorial/connect_pool.py

@@ -10,8 +10,9 @@
 
 import cx_Oracle
 import threading
+import db_config
 
-pool = cx_Oracle.SessionPool("pythonhol", "welcome", "localhost/orclpdb",
+pool = cx_Oracle.SessionPool(db_config.user, db_config.pw, db_config.dsn,
                              min = 2, max = 5, increment = 1, threaded = True)
 
 def Query():

samples/tutorial/connect_pool2.py

@@ -0,0 +1,3 @@
+user = "pythonhol"
+pw = "welcome"
+dsn = "localhost/orclpdb"

samples/tutorial/db_config.py

@@ -0,0 +1,3 @@
+def user = "pythonhol"
+def pw = "welcome"
+def connect_string = "localhost/orclpdb"

samples/tutorial/db_config.sql

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 res = cur.callfunc('myfunc', int, ('abc', 2))

samples/tutorial/plsql_func.py

@@ -8,7 +8,18 @@
 
 set echo on
 
-connect pythonhol/welcome@localhost/orclpdb
+@@db_config.sql
+connect &user/&pw@&connect_string
+
+begin
+  execute immediate 'drop table ptab';
+exception
+when others then
+  if sqlcode not in (-00942) then
+    raise;
+  end if;
+end;
+/
 
 create table ptab (mydata varchar(20), myid number);
 

samples/tutorial/plsql_func.sql

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 myvar = cur.var(int)

samples/tutorial/plsql_proc.py

@@ -8,7 +8,8 @@
 
 set echo on
 
-connect pythonhol/welcome@localhost/orclpdb
+@@db_config.sql
+connect &user/&pw@&connect_string
 
 create or replace procedure myproc(v1_p in number, v2_p out number) as
 begin

samples/tutorial/plsql_proc.sql

@@ -9,5 +9,6 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)

samples/tutorial/query.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 
 cur = con.cursor()
 cur.execute('select * from dept order by deptno')

samples/tutorial/query2.py

@@ -10,8 +10,9 @@
 
 import cx_Oracle
 import time
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 
 start = time.time()
 

samples/tutorial/query_arraysize.py

@@ -8,9 +8,18 @@
 
 set echo on
 
-connect pythonhol/welcome@localhost/orclpdb
+@@db_config.sql
+connect &user/&pw@&connect_string
 
-drop table bigtab;
+begin
+  execute immediate 'drop table bigtab';
+exception
+when others then
+  if sqlcode not in (-00942) then
+    raise;
+  end if;
+end;
+/
 
 create table bigtab (mycol varchar2(20));
 begin

samples/tutorial/query_arraysize.sql

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 cur.execute("select * from dept order by deptno")

samples/tutorial/query_many.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 cur.execute("select * from dept order by deptno")

samples/tutorial/query_one.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor(scrollable = True)
 
 cur.execute("select * from dept order by deptno")

samples/tutorial/query_scroll.py

@@ -10,8 +10,9 @@
 
 import collections
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 cur.execute("select deptno, dname from dept")

samples/tutorial/rowfactory.py

@@ -9,12 +9,13 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
 class MyConnection(cx_Oracle.Connection):
 
     def __init__(self):
         print("Connecting to database")
-        return super(MyConnection, self).__init__("pythonhol", "welcome", "localhost/orclpdb")
+        return super(MyConnection, self).__init__(db_config.user, db_config.pw, db_config.dsn)
 
 con = MyConnection()
 cur = con.cursor()

samples/tutorial/subclass.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 for value, in cur.execute("select 0.1 from dual"):

samples/tutorial/type_converter.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 # Create table

samples/tutorial/type_input.py

@@ -9,8 +9,9 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect("pythonhol", "welcome", "localhost/orclpdb")
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 cur = con.cursor()
 
 print("Standard output...")

samples/tutorial/type_output.py

@@ -9,7 +9,8 @@
 from __future__ import print_function
 
 import cx_Oracle
+import db_config
 
-con = cx_Oracle.connect('pythonhol/welcome@localhost/orclpdb')
+con = cx_Oracle.connect(db_config.user, db_config.pw, db_config.dsn)
 
 print(cx_Oracle.version)