-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Added samples for using Cloud SQL with App Engine Python 3.7 Standard #1672
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 4 commits
63c0f7e
93c382d
4dfb600
e3f09e3
2cf1fd8
e1836ca
6828bb0
76a8742
5d05163
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# [START gae_python37_cloudsql_config] | ||
runtime: python37 | ||
|
||
env_variables: | ||
CLOUDSQL_USERNAME: YOUR-USERNAME | ||
CLOUDSQL_PASSWORD: YOUR-PASSWORD | ||
CLOUDSQL_DATABASE_NAME: YOUR-DATABASE | ||
CLOUDSQL_CONNECTION_NAME: YOUR-CONNECTION-NAME | ||
# [END gae_python37_cloudsql_config] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START gae_python37_cloudsql_mysql] | ||
import os | ||
|
||
from flask import Flask | ||
import mysql.connector | ||
|
||
db_user = os.environ.get('CLOUD_SQL_USERNAME') | ||
db_password = os.environ.get('CLOUD_SQL_PASSWORD') | ||
db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME') | ||
db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME') | ||
|
||
app = Flask(__name__) | ||
|
||
|
||
@app.route('/') | ||
def main(): | ||
# When deployed to App Engine, the `GAE_ENV` environment variable will be | ||
# set to `standard` | ||
if os.environ.get('GAE_ENV'): | ||
# If deployed, use the local socket interface for accessing Cloud SQL | ||
host = f'/cloudsql/{db_connection_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 = mysql.connector.connect(user=db_user, password=db_password, | ||
host=host, database=db_name) | ||
cursor = cnx.cursor() | ||
cursor.execute('SELECT NOW() as now;') | ||
result = cursor.fetchall() | ||
current_time = result[0][0] | ||
cursor.close() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The adaptor doesn't support anything like "with" statements (context managers) here, do they? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I checked the reference and it does not seem to have the |
||
cnx.close() | ||
|
||
return str(current_time) | ||
# [END gae_python37_cloudsql_mysql] | ||
|
||
|
||
if __name__ == '__main__': | ||
app.run(host='127.0.0.1', port=8080, debug=True) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START gae_python37_cloudsql_mysql_pooling] | ||
import os | ||
|
||
from flask import Flask | ||
import mysql.connector.pooling | ||
|
||
db_user = os.environ.get('CLOUD_SQL_USERNAME') | ||
db_password = os.environ.get('CLOUD_SQL_PASSWORD') | ||
db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME') | ||
db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME') | ||
|
||
# When deployed to App Engine, the `GAE_ENV` environment variable will be | ||
# set to `standard` | ||
if os.environ.get('GAE_ENV'): | ||
# If deployed, use the local socket interface for accessing Cloud SQL | ||
host = f'/cloudsql/{db_connection_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' | ||
|
||
db_config = { | ||
'user': db_user, | ||
'password': db_password, | ||
'database': db_name, | ||
'host': host | ||
} | ||
|
||
cnxpool = mysql.connector.pooling.MySQLConnectionPool(pool_name='cnxpool', | ||
pool_size=3, **db_config) | ||
|
||
app = Flask(__name__) | ||
|
||
|
||
@app.route('/') | ||
def main(): | ||
cnx = cnxpool.get_connection() | ||
cursor = cnx.cursor() | ||
cursor.execute('SELECT NOW() as now;') | ||
result = cursor.fetchall() | ||
current_time = result[0][0] | ||
cursor.close() | ||
# If the connection comes from a pool, close() will send the connection | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good comment here! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks :) |
||
# back to the pool instead of closing it | ||
cnx.close() | ||
|
||
return str(current_time) | ||
# [END gae_python37_cloudsql_mysql_pooling] | ||
|
||
|
||
if __name__ == '__main__': | ||
app.run(host='127.0.0.1', port=8080, debug=True) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START gae_python37_cloudsql_psql] | ||
import os | ||
|
||
from flask import Flask | ||
import psycopg2 | ||
|
||
db_user = os.environ.get('CLOUD_SQL_USERNAME') | ||
db_password = os.environ.get('CLOUD_SQL_PASSWORD') | ||
db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME') | ||
db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME') | ||
|
||
app = Flask(__name__) | ||
|
||
|
||
@app.route('/') | ||
def main(): | ||
# When deployed to App Engine, the `GAE_ENV` environment variable will be | ||
# set to `standard` | ||
if os.environ.get('GAE_ENV'): | ||
# If deployed, use the local socket interface for accessing Cloud SQL | ||
host = f'/cloudsql/{db_connection_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 = psycopg2.connect(dbname=db_name, user=db_user, | ||
password=db_password, host=host) | ||
with cnx.cursor() as cursor: | ||
cursor.execute('SELECT NOW() as now;') | ||
result = cursor.fetchall() | ||
current_time = result[0][0] | ||
cnx.commit() | ||
cnx.close() | ||
|
||
return str(current_time) | ||
# [END gae_python37_cloudsql_psql] | ||
|
||
|
||
if __name__ == '__main__': | ||
app.run(host='127.0.0.1', port=8080, debug=True) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START gae_python37_cloudsql_psql_pooling] | ||
import os | ||
|
||
from flask import Flask | ||
import psycopg2.pool | ||
|
||
db_user = os.environ.get('CLOUD_SQL_USERNAME') | ||
db_password = os.environ.get('CLOUD_SQL_PASSWORD') | ||
db_name = os.environ.get('CLOUD_SQL_DATABASE_NAME') | ||
db_connection_name = os.environ.get('CLOUD_SQL_CONNECTION_NAME') | ||
|
||
# When deployed to App Engine, the `GAE_ENV` environment variable will be | ||
# set to `standard` | ||
if os.environ.get('GAE_ENV'): | ||
# If deployed, use the local socket interface for accessing Cloud SQL | ||
host = f'/cloudsql/{db_connection_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' | ||
|
||
db_config = { | ||
'user': db_user, | ||
'password': db_password, | ||
'database': db_name, | ||
'host': host | ||
} | ||
|
||
cnxpool = psycopg2.pool.ThreadedConnectionPool(minconn=1, maxconn=3, | ||
**db_config) | ||
|
||
app = Flask(__name__) | ||
|
||
|
||
@app.route('/') | ||
def main(): | ||
cnx = cnxpool.getconn() | ||
with cnx.cursor() as cursor: | ||
cursor.execute('SELECT NOW() as now;') | ||
result = cursor.fetchall() | ||
current_time = result[0][0] | ||
cnx.commit() | ||
cnxpool.putconn(cnx) | ||
|
||
return str(current_time) | ||
# [END gae_python37_cloudsql_psql_pooling] | ||
|
||
|
||
if __name__ == '__main__': | ||
app.run(host='127.0.0.1', port=8080, debug=True) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from unittest.mock import MagicMock | ||
|
||
import mysql.connector.pooling | ||
import psycopg2.pool | ||
|
||
|
||
def test_main(): | ||
import main | ||
main.mysql.connector = MagicMock() | ||
main.mysql.connector.connect().cursor().fetchall.return_value = [['0']] | ||
|
||
main.app.testing = True | ||
client = main.app.test_client() | ||
|
||
r = client.get('/') | ||
assert r.status_code == 200 | ||
assert '0' in r.data.decode('utf-8') | ||
|
||
|
||
def test_main_pooling(): | ||
mysql.connector.pooling.MySQLConnectionPool = MagicMock() | ||
|
||
import main_pooling | ||
|
||
mock_pool = main_pooling.mysql.connector.pooling.MySQLConnectionPool() | ||
mock_pool.get_connection().cursor().fetchall.return_value = [['0']] | ||
|
||
main_pooling.app.testing = True | ||
client = main_pooling.app.test_client() | ||
|
||
r = client.get('/') | ||
assert r.status_code == 200 | ||
assert '0' in r.data.decode('utf-8') | ||
|
||
|
||
def test_main_postgressql(): | ||
import main_postgressql | ||
main_postgressql.psycopg2.connect = MagicMock() | ||
mock_cursor = main_postgressql.psycopg2.connect().cursor() | ||
mock_cursor.__enter__().fetchall.return_value = [['0']] | ||
|
||
main_postgressql.app.testing = True | ||
client = main_postgressql.app.test_client() | ||
|
||
r = client.get('/') | ||
assert r.status_code == 200 | ||
assert '0' in r.data.decode('utf-8') | ||
|
||
|
||
def test_main_postgressql_pooling(): | ||
psycopg2.pool.ThreadedConnectionPool = MagicMock() | ||
|
||
import main_postgressql_pooling | ||
|
||
mock_pool = main_postgressql_pooling.psycopg2.pool.ThreadedConnectionPool() | ||
mock_pool.getconn().cursor().__enter__().fetchall.return_value = [['0']] | ||
|
||
main_postgressql_pooling.app.testing = True | ||
client = main_postgressql_pooling.app.test_client() | ||
|
||
r = client.get('/') | ||
assert r.status_code == 200 | ||
assert '0' in r.data.decode('utf-8') |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
psycopg2==2.7.5 | ||
psycopg2-binary==2.7.5 | ||
mysql-connector-python==8.0.12 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we might be intentionally standardizing on pymysql as it has the largest usage share and is easiest for our users to install. Is there a particular reason to go with mysql connector?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pymysql
does not have built-in support for connection pooling :(