Bug fixes. (GoogleCloudPlatform#1820)

Author: chenyumic

appengine/standard_python37/cloudsql/app.yaml

@@ -2,8 +2,8 @@
 runtime: python37
 
 env_variables:
-  CLOUDSQL_USERNAME: YOUR-USERNAME
-  CLOUDSQL_PASSWORD: YOUR-PASSWORD
-  CLOUDSQL_DATABASE_NAME: YOUR-DATABASE
-  CLOUDSQL_CONNECTION_NAME: YOUR-CONNECTION-NAME
+  CLOUD_SQL_USERNAME: YOUR-USERNAME
+  CLOUD_SQL_PASSWORD: YOUR-PASSWORD
+  CLOUD_SQL_DATABASE_NAME: YOUR-DATABASE
+  CLOUD_SQL_CONNECTION_NAME: YOUR-CONNECTION-NAME
 # [END gae_python37_cloudsql_config]

appengine/standard_python37/cloudsql/main_mysql.py

@@ -32,16 +32,18 @@ def main():
     # set to `standard`
     if os.environ.get('GAE_ENV') == 'standard':
         # If deployed, use the local socket interface for accessing Cloud SQL
-        host = '/cloudsql/{}'.format(db_connection_name)
+        unix_socket = '/cloudsql/{}'.format(db_connection_name)
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              host=unix_socket, db=db_name)
     else:
         # If running locally, use the TCP connections instead
         # Set up Cloud SQL Proxy (cloud.google.com/sql/docs/mysql/sql-proxy)
         # so that your application can use 127.0.0.1:3306 to connect to your
         # Cloud SQL instance
         host = '127.0.0.1'
+        cnx = pymysql.connect(user=db_user, password=db_password,
+                              host=host, db=db_name)
 
-    cnx = pymysql.connect(user=db_user, password=db_password,
-                          host=host, db=db_name)
     with cnx.cursor() as cursor:
         cursor.execute('SELECT NOW() as now;')
         result = cursor.fetchall()

appengine/standard_python37/cloudsql/main_mysql_pooling.py

@@ -27,20 +27,22 @@
 # set to `standard`
 if os.environ.get('GAE_ENV') == 'standard':
     # If deployed, use the local socket interface for accessing Cloud SQL
-    host = '/cloudsql/{}'.format(db_connection_name)
+    unix_socket = '/cloudsql/{}'.format(db_connection_name)
+    engine_url = 'mysql+pymysql://{}:{}@/{}?unix_socket={}'.format(
+        db_user, db_password, db_name, unix_socket)
 else:
     # If running locally, use the TCP connections instead
     # Set up Cloud SQL Proxy (cloud.google.com/sql/docs/mysql/sql-proxy)
     # so that your application can use 127.0.0.1:3306 to connect to your
     # Cloud SQL instance
     host = '127.0.0.1'
+    engine_url = 'mysql+pymysql://{}:{}@{}/{}'.format(
+        db_user, db_password, host, db_name)
 
 # The Engine object returned by create_engine() has a QueuePool integrated
 # See https://docs.sqlalchemy.org/en/latest/core/pooling.html for more
 # information
-engine = sqlalchemy.create_engine('mysql+pymysql://{}:{}@{}/{}'.format(
-    db_user, db_password, host, db_name
-), pool_size=3)
+engine = sqlalchemy.create_engine(engine_url, pool_size=3)
 
 app = Flask(__name__)
 

appengine/standard_python37/cloudsql/requirements.txt

@@ -1,3 +1,4 @@
+flask==1.0.2
 psycopg2==2.7.5
 psycopg2-binary==2.7.5
 PyMySQL==0.9.2