From 7ed572076b02a2910384a70b941c41cf219cfcc4 Mon Sep 17 00:00:00 2001
From: harshadyeola <harshad.yeola@rtcamp.com>
Date: Mon, 5 Jan 2015 16:59:23 +0530
Subject: [PATCH] fixed "ProgrammingError" object has no attribute "reason"

---
 ee/cli/plugins/site_functions.py | 62 ++++++++++++++++----------------
 ee/core/mysql.py                 |  7 ++--
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index ec9ead53..f001ca8f 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -63,6 +63,7 @@ def setup_database(self, data):
     prompt_dbname = self.app.config.get('mysql', 'db-name')
     prompt_dbuser = self.app.config.get('mysql', 'db-user')
     ee_mysql_host = self.app.config.get('mysql', 'grant-host')
+    ee_db_name = ''
 
     if prompt_dbname == 'True':
         try:
@@ -72,8 +73,8 @@ def setup_database(self, data):
             print("{0} {1}".format(e.errorno, e.strerror))
             sys.exit(0)
 
-        if not ee_db_name:
-            ee_db_name = ee_replace_dot
+    if not ee_db_name:
+        ee_db_name = ee_replace_dot
 
     if prompt_dbuser:
         try:
@@ -85,35 +86,34 @@ def setup_database(self, data):
             print("{0} {1}".format(e.errorno, e.strerror))
             sys.exit(1)
 
-        if not ee_db_username:
-            ee_db_username = ee_replace_dot
-        if not ee_db_password:
-            ee_db_password = ee_random
-
-        if len(ee_db_name) > 16:
-            print('Autofix MySQL username (ERROR 1470 (HY000)), please wait...'
-                  )
-            ee_random10 = (''.join(random.sample(string.ascii_uppercase +
-                           string.ascii_lowercase + string.digits, 10)))
-            ee_db_name = (ee_db_name[0:6] + ee_random10)
-
-        # create MySQL database
-        EEMysql.execute(self, "create database \'{0}\'"
-                        .format(ee_db_name))
-
-        # Create MySQL User
-        EEMysql.execute(self,
-                        "create user \'{0}\'@\'{1}\' identified by \'{2}\'"
-                        .format(ee_db_username, ee_mysql_host, ee_db_password))
-
-        # Grant permission
-        EEMysql.execute(self,
-                        "grant all privileges on \'{0}\'.* to \'{1}\'@\'{2}\'"
-                        .format(ee_db_name, ee_db_username, ee_db_password))
-        data['ee_db_name'] = ee_db_name
-        data['ee_db_user'] = ee_db_username
-        data['ee_db_pass'] = ee_db_password
-        return data
+    if not ee_db_username:
+        ee_db_username = ee_replace_dot
+    if not ee_db_password:
+        ee_db_password = ee_random
+
+    if len(ee_db_username) > 16:
+        print('Autofix MySQL username (ERROR 1470 (HY000)), please wait...')
+        ee_random10 = (''.join(random.sample(string.ascii_uppercase +
+                       string.ascii_lowercase + string.digits, 10)))
+        ee_db_name = (ee_db_name[0:6] + ee_random10)
+
+    # create MySQL database
+    EEMysql.execute(self, "create database \'{0}\'"
+                    .format(ee_db_name))
+
+    # Create MySQL User
+    EEMysql.execute(self,
+                    "create user \'{0}\'@\'{1}\' identified by \'{2}\'"
+                    .format(ee_db_username, ee_mysql_host, ee_db_password))
+
+    # Grant permission
+    EEMysql.execute(self,
+                    "grant all privileges on \'{0}\'.* to \'{1}\'@\'{2}\'"
+                    .format(ee_db_name, ee_db_username, ee_db_password))
+    data['ee_db_name'] = ee_db_name
+    data['ee_db_user'] = ee_db_username
+    data['ee_db_pass'] = ee_db_password
+    return data
 
 
 def setup_wordpress(self, data):
diff --git a/ee/core/mysql.py b/ee/core/mysql.py
index 19381f4b..dbc58421 100644
--- a/ee/core/mysql.py
+++ b/ee/core/mysql.py
@@ -28,14 +28,15 @@ class EEMysql():
                                        user=user, passwd=passwd)
                 cur = conn.cursor()
             except Exception as e:
-                self.app.log.error('Unable to connect to database', e.reason())
-                self.app.log.info("Unable to connect to database")
+                self.app.log.error('Unable to connect to database: {0}'
+                                   .format(e.strerror))
                 return False
 
         try:
             cur.execute(statement)
         except Exception as e:
-            self.app.log.error('Error occured while executing', e.reason())
+            self.app.log.error('Error occured while executing: {0}'
+                               .format(e.strerror))
             self.app.log.info("Error occured while executing "+statement)
             cur.close()
             conn.close()