diff --git a/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc b/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc index 47cadd0..53fb04a 100644 Binary files a/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc and b/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc differ diff --git a/exchange/extract/exchange_extract_function.py b/exchange/extract/exchange_extract_function.py index 567cdef..4a6888b 100644 --- a/exchange/extract/exchange_extract_function.py +++ b/exchange/extract/exchange_extract_function.py @@ -38,7 +38,7 @@ def mysql_dict_sql_to_csv(SQL_DICT, path, mysqldb, mysqlcursor): headers = [col[0] for col in mysqlcursor.description] # get headers mysqlresult.insert(0, tuple(headers)) fp = open(concat(path,filename), 'w', newline = '', encoding = 'utf-8-sig') - myFile = csv.writer(fp) + myFile = csv.writer(fp,delimiter='|',quotechar='"') myFile.writerows(mysqlresult) fp.close() diff --git a/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc b/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc index 61fb23d..66e5026 100644 Binary files a/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc and b/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc differ diff --git a/exchange/load/exchange_load_function.py b/exchange/load/exchange_load_function.py index fa57e23..cc2a706 100644 --- a/exchange/load/exchange_load_function.py +++ b/exchange/load/exchange_load_function.py @@ -1,4 +1,5 @@ from google.cloud import storage +import boto3 def login_cloudstorage_credential(credential): try: @@ -18,4 +19,4 @@ def upload_to_bucket(storage_client, blob_name, file_path): except Exception as e: print(e) print("[FUNCTION_ERROR]-upload_to_bucket",blob_name) - return False + return False \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6bd9f92..15604fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,2 @@ mysql-connector-python==8.0.29 -<<<<<<< HEAD -google-cloud-storage==2.5.0 -======= -google-cloud-storage==2.5.0 ->>>>>>> fd92c3d7ac25862e651876c9287408f2a9610730 +google-cloud-storage==2.5.0 \ No newline at end of file