From 35c43318ed42da6f17c674441df10e3822a3e77a Mon Sep 17 00:00:00 2001
From: "Saurabh S. Chaturvedi" <saurabh.chaturvedi63@gmail.com>
Date: Wed, 8 Nov 2017 02:31:41 +0530
Subject: [PATCH] Complete Exercise 6-15: Supporting Different RDBMSs

---
 Chap6/sqlite_test/test | Bin 8192 -> 8192 bytes
 Chap6/ushuffle_dbU.py  |   2 +-
 Chap6/ushuffle_sad.py  |  18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Chap6/sqlite_test/test b/Chap6/sqlite_test/test
index 13b667a596e33c8b46148ff385b80c764d9ced7e..0b6a40204cbe90fed8afe7ba322f7efcf5968f53 100644
GIT binary patch
delta 324
zcmZp0XmFSyEm+IIz`z8>j6k|%qK+|R?Z$+a{K}8{uk-Ka-@w0^e;R)~e+7RGzdgSp
zKQ}VmSh$RD@+CRTdVU`UH73r)+)5cuAX6I1Of1UJQ>XxP_<)?e^wgY0+08usEaFUz
zsYQ92sWP9KxcOK_nHW<N%Ti^!nE1091eiE;Q*&}Mi;EK#XYul|NHQ_zq!#C7rph%i
z@t<ViW#Y_9EGnv$>F4DF$pMw-XO_r4XX52#DFgC>24&_Y%H3n)<^Y+So1d2`^M;9=
z9mGjXtW1@f!^F)7;uM!8=E-hn;$meHW@60B%$1E`;{O72W^rm!YF?srG#4{SrXaCI
iPM(RMiA5HuDm5=JGcC19b_Xb|c$he|Qj3e_UH|~P=}UM3

delta 324
zcmZ|Lu}TCn5CG6*2*{r62C)#`Y*efc>=eZAiu;1A1RDp;Nseq*ljXSO3b(MbQLz(i
z!Sb-s@9+ccL<=kZ0TZ#6AxvIihMBazws(~;P6;9KcWB7&dTX0bXNM1b^Nmk<$@_eV
z&;1v()BEh^Medye9Vu(|P`Ton@c|L>!F%};!GS7cDqYKWmT^`<QU+`9apN}4*a{?G
zIb|_F;O8U<dW2(bQNFUk6eyOB=(1#<EkQEUWwGDsgeyJ4TCM^ACJ1zFls8(*mIV(&
z3A)OzPonz2{gk+f*ad3Pxkg+@b%FXCZSfQlCN3+B;xi&ljP_U=EFM`3Y&k68tXASH
Oe$@idAvS9Dj{N{Q*-dr;

diff --git a/Chap6/ushuffle_dbU.py b/Chap6/ushuffle_dbU.py
index ddb5534..43fcfdc 100644
--- a/Chap6/ushuffle_dbU.py
+++ b/Chap6/ushuffle_dbU.py
@@ -14,7 +14,7 @@
 
 COLSIZ = 10
 FIELDS = ('login', 'userid', 'projid')
-RDBMSs = {'s': 'sqlite', 'm': 'mysql', 'g': 'gadfly'}
+RDBMSs = {'s': 'sqlite', 'm': 'mysql', 'g': 'gadfly', 'p': 'postgresql'}
 DBNAME = 'test'
 DBUSER = 'root'
 DB_EXC = None
diff --git a/Chap6/ushuffle_sad.py b/Chap6/ushuffle_sad.py
index 328fe46..f3e49ac 100644
--- a/Chap6/ushuffle_sad.py
+++ b/Chap6/ushuffle_sad.py
@@ -7,11 +7,13 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from password import PASSWORD
-from ushuffle_dbU import DBNAME, NAMELEN, randName, FIELDS, tformat, cformat, setup
+from ushuffle_dbU import DBNAME, NAMELEN, randName, FIELDS, tformat, cformat,\
+RDBMSs, scanf
 
 DSNs = {
     'mysql': 'mysql://root@localhost/%s/%s' % (DBNAME, PASSWORD),
     'sqlite': 'sqlite:///:memory:',
+    'postgresql': 'postgresql+psycopg2://binaryBoy:%s@localhost/%s' % (PASSWORD, DBNAME)
 }
 
 Base = declarative_base()
@@ -84,6 +86,20 @@ def __getattr__(self, attr):
     def finish(self):
         self.ses.connection().close()
     
+
+def setup():
+    return RDBMSs[scanf(
+    '''
+    Choose a database system:
+
+    (M)ySQL
+    (G)adfly
+    (S)QLite
+    (P)ostgreSQL
+
+    Enter choice: ''').strip().lower()[0]]
+
+
 def main():
     printf("*** Connect to %r database" % DBNAME)
     db = setup()