jonny/gcp-hockey-results
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove commented out MySqlDB commands

Browse Source
This commit is contained in:
Jonathan Ervine 2021-09-20 07:15:44 +08:00
parent c0d01cca3f
commit 2d0be883da
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app.yaml
View File

@ -21,6 +21,7 @@ libraries:
env_variables: env_variables:
CLOUDSQL_CONNECTION_NAME: hk-hockey:asia-east2:hk-hockey-sql CLOUDSQL_CONNECTION_NAME: hk-hockey:asia-east2:hk-hockey-sql
LOCAL_DB_SERVER: mariadb.db.svc.cluster.local
CLOUDSQL_USER: root CLOUDSQL_USER: root
CLOUDSQL_WRITE_USER: hockeyWrite CLOUDSQL_WRITE_USER: hockeyWrite
CLOUDSQL_READ_USER: hockeyRead CLOUDSQL_READ_USER: hockeyRead

16
dbWrite.py
View File

@ -26,8 +26,6 @@ def write_cloudsql():
# Connect using the unix socket located at # Connect using the unix socket located at
# /cloudsql/cloudsql-connection-name. # /cloudsql/cloudsql-connection-name.
cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME) cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME)
# db = MySQLdb.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
# If the unix socket is unavailable, then try to connect using TCP. This # If the unix socket is unavailable, then try to connect using TCP. This
@ -37,7 +35,6 @@ def write_cloudsql():
# $ cloud_sql_proxy -instances=your-connection-name=tcp:3306 # $ cloud_sql_proxy -instances=your-connection-name=tcp:3306
# #
else: else:
# db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET) db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET)
return db return db
@ -48,8 +45,6 @@ def write_cloudsql_static():
# Connect using the unix socket located at # Connect using the unix socket located at
# /cloudsql/cloudsql-connection-name. # /cloudsql/cloudsql-connection-name.
cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME) cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME)
# db = MySQLdb.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET) db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
# If the unix socket is unavailable, then try to connect using TCP. This # If the unix socket is unavailable, then try to connect using TCP. This
@ -59,7 +54,6 @@ def write_cloudsql_static():
# $ cloud_sql_proxy -instances=your-connection-name=tcp:3306 # $ cloud_sql_proxy -instances=your-connection-name=tcp:3306
# #
else: else:
# db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET) db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_WRITE_USER, passwd=CLOUDSQL_WRITE_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
return db return db
@ -70,8 +64,6 @@ def read_cloudsql():
# Connect using the unix socket located at # Connect using the unix socket located at
# /cloudsql/cloudsql-connection-name. # /cloudsql/cloudsql-connection-name.
cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME) cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME)
# db = MySQLdb.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET) db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
# If the unix socket is unavailable, then try to connect using TCP. This # If the unix socket is unavailable, then try to connect using TCP. This
@ -81,7 +73,6 @@ def read_cloudsql():
# $ cloud_sql_proxy -instances=your-connection-name=tcp:3306 # $ cloud_sql_proxy -instances=your-connection-name=tcp:3306
# #
else: else:
# db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET) db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=LOCAL_DATABASE, charset=CLOUDSQL_CHARSET)
return db return db
@ -92,8 +83,6 @@ def read_cloudsql_static():
# Connect using the unix socket located at # Connect using the unix socket located at
# /cloudsql/cloudsql-connection-name. # /cloudsql/cloudsql-connection-name.
cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME) cloudsql_unix_socket = os.path.join('/cloudsql', CLOUDSQL_CONNECTION_NAME)
# db = MySQLdb.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET) db = pymysql.connect(unix_socket=cloudsql_unix_socket, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
# If the unix socket is unavailable, then try to connect using TCP. This # If the unix socket is unavailable, then try to connect using TCP. This
@ -103,14 +92,12 @@ def read_cloudsql_static():
# $ cloud_sql_proxy -instances=your-connection-name=tcp:3306 # $ cloud_sql_proxy -instances=your-connection-name=tcp:3306
# #
else: else:
# db = MySQLdb.connect(host='db.ipa.champion', user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET) db = pymysql.connect(host=LOCAL_DB_SERVER, user=CLOUDSQL_READ_USER, passwd=CLOUDSQL_READ_PASSWORD, db=CLOUDSQL_DATABASE_STATIC, charset=CLOUDSQL_CHARSET)
return db return db
def sql_write(sql_cmd): def sql_write(sql_cmd):
try: try:
db = write_cloudsql() db = write_cloudsql()
# cursor = db.cursor(MySQLdb.cursors.DictCursor)
cursor = db.cursor(pymysql.cursors.DictCursor) cursor = db.cursor(pymysql.cursors.DictCursor)
cursor.execute(sql_cmd) cursor.execute(sql_cmd)
db.commit() db.commit()
@ -124,7 +111,6 @@ def sql_write(sql_cmd):
def sql_write_static(sql_cmd): def sql_write_static(sql_cmd):
try: try:
db = write_cloudsql_static() db = write_cloudsql_static()
# cursor = db.cursor(MySQLdb.cursors.DictCursor)
cursor = db.cursor(pymysql.cursors.DictCursor) cursor = db.cursor(pymysql.cursors.DictCursor)
cursor.execute(sql_cmd) cursor.execute(sql_cmd)
db.commit() db.commit()
@ -138,7 +124,6 @@ def sql_write_static(sql_cmd):
def sql_read(sql_cmd): def sql_read(sql_cmd):
try: try:
db = read_cloudsql() db = read_cloudsql()
# cursor = db.cursor(MySQLdb.cursors.DictCursor)
cursor = db.cursor(pymysql.cursors.DictCursor) cursor = db.cursor(pymysql.cursors.DictCursor)
cursor.execute(sql_cmd) cursor.execute(sql_cmd)
rows = cursor.fetchall() rows = cursor.fetchall()
@ -153,7 +138,6 @@ def sql_read(sql_cmd):
def sql_read_static(sql_cmd): def sql_read_static(sql_cmd):
try: try:
db = read_cloudsql_static() db = read_cloudsql_static()
# cursor = db.cursor(MySQLdb.cursors.DictCursor)
cursor = db.cursor(pymysql.cursors.DictCursor) cursor = db.cursor(pymysql.cursors.DictCursor)
cursor.execute(sql_cmd) cursor.execute(sql_cmd)
rows = cursor.fetchall() rows = cursor.fetchall()