Browse Source

fixed "ProgrammingError" object has no attribute "reason"

bugfixes
harshadyeola 10 years ago
parent
commit
7ed572076b
  1. 62
      ee/cli/plugins/site_functions.py
  2. 7
      ee/core/mysql.py

62
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_dbname = self.app.config.get('mysql', 'db-name')
prompt_dbuser = self.app.config.get('mysql', 'db-user') prompt_dbuser = self.app.config.get('mysql', 'db-user')
ee_mysql_host = self.app.config.get('mysql', 'grant-host') ee_mysql_host = self.app.config.get('mysql', 'grant-host')
ee_db_name = ''
if prompt_dbname == 'True': if prompt_dbname == 'True':
try: try:
@ -72,8 +73,8 @@ def setup_database(self, data):
print("{0} {1}".format(e.errorno, e.strerror)) print("{0} {1}".format(e.errorno, e.strerror))
sys.exit(0) sys.exit(0)
if not ee_db_name: if not ee_db_name:
ee_db_name = ee_replace_dot ee_db_name = ee_replace_dot
if prompt_dbuser: if prompt_dbuser:
try: try:
@ -85,35 +86,34 @@ def setup_database(self, data):
print("{0} {1}".format(e.errorno, e.strerror)) print("{0} {1}".format(e.errorno, e.strerror))
sys.exit(1) sys.exit(1)
if not ee_db_username: if not ee_db_username:
ee_db_username = ee_replace_dot ee_db_username = ee_replace_dot
if not ee_db_password: if not ee_db_password:
ee_db_password = ee_random ee_db_password = ee_random
if len(ee_db_name) > 16: if len(ee_db_username) > 16:
print('Autofix MySQL username (ERROR 1470 (HY000)), please wait...' print('Autofix MySQL username (ERROR 1470 (HY000)), please wait...')
) ee_random10 = (''.join(random.sample(string.ascii_uppercase +
ee_random10 = (''.join(random.sample(string.ascii_uppercase + string.ascii_lowercase + string.digits, 10)))
string.ascii_lowercase + string.digits, 10))) ee_db_name = (ee_db_name[0:6] + ee_random10)
ee_db_name = (ee_db_name[0:6] + ee_random10)
# create MySQL database
# create MySQL database EEMysql.execute(self, "create database \'{0}\'"
EEMysql.execute(self, "create database \'{0}\'" .format(ee_db_name))
.format(ee_db_name))
# Create MySQL User
# Create MySQL User EEMysql.execute(self,
EEMysql.execute(self, "create user \'{0}\'@\'{1}\' identified by \'{2}\'"
"create user \'{0}\'@\'{1}\' identified by \'{2}\'" .format(ee_db_username, ee_mysql_host, ee_db_password))
.format(ee_db_username, ee_mysql_host, ee_db_password))
# Grant permission
# Grant permission EEMysql.execute(self,
EEMysql.execute(self, "grant all privileges on \'{0}\'.* to \'{1}\'@\'{2}\'"
"grant all privileges on \'{0}\'.* to \'{1}\'@\'{2}\'" .format(ee_db_name, ee_db_username, ee_db_password))
.format(ee_db_name, ee_db_username, ee_db_password)) data['ee_db_name'] = ee_db_name
data['ee_db_name'] = ee_db_name data['ee_db_user'] = ee_db_username
data['ee_db_user'] = ee_db_username data['ee_db_pass'] = ee_db_password
data['ee_db_pass'] = ee_db_password return data
return data
def setup_wordpress(self, data): def setup_wordpress(self, data):

7
ee/core/mysql.py

@ -28,14 +28,15 @@ class EEMysql():
user=user, passwd=passwd) user=user, passwd=passwd)
cur = conn.cursor() cur = conn.cursor()
except Exception as e: except Exception as e:
self.app.log.error('Unable to connect to database', e.reason()) self.app.log.error('Unable to connect to database: {0}'
self.app.log.info("Unable to connect to database") .format(e.strerror))
return False return False
try: try:
cur.execute(statement) cur.execute(statement)
except Exception as e: 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) self.app.log.info("Error occured while executing "+statement)
cur.close() cur.close()
conn.close() conn.close()

Loading…
Cancel
Save