Always act within Flask app context, improved query performance, fixed logger

Author: toddbirchard

ghost_sql_sanitation/__init__.py

@@ -1,14 +1,16 @@
 """Appliction entry point."""
-from flask import Flask, make_response, jsonify
-from .database import Database
+from flask import Flask
 from config import db_pem, db_uri, sql_folder
-from .queries import SQLFetcher
+from .database import Database
+
+
+db = Database(db_pem, db_uri)
 
 
 def main(request):
     """Endpoint entry point."""
-    db = Database(db_pem, db_uri)
-    fetcher = SQLFetcher(sql_folder)
-    queries = fetcher.get_queries()
-    results = db.run_query(queries)
-    return make_response(jsonify(results), 200)
+    app = Flask(__name__)
+    with app.app_context():
+        from .run import run_queries
+
+        return run_queries(db)

ghost_sql_sanitation/database.py

@@ -2,7 +2,7 @@
 from sqlalchemy import create_engine, MetaData
 from loguru import logger
 
-logger.add(stdout, format="{time} {message}", level="INFO")
+logger.add(stdout, format="{time} {message}", level="INFO", filter="database")
 
 
 class Database:
@@ -25,9 +25,9 @@ def run_query(self, sql_queries):
             results = self.engine.execute(v)
             affected_rows = results.rowcount
             logger.info(f'Modified {affected_rows} rows.')
-        return affected_rows
+        return self.__construct_response(affected_rows)
 
     @staticmethod
-    def __construct_response(num_rows):
+    def __construct_response(affected_rows):
         """Summarize results of an executed query."""
-        return f'Modified {num_rows} rows.'
+        return f'Modified {affected_rows} rows.'

ghost_sql_sanitation/queries.py

@@ -4,7 +4,7 @@
 from os.path import isfile, join
 from loguru import logger
 
-logger.add(stdout, format="{time} {message}", level="INFO")
+logger.add(stdout, format="{time} {message}", level="INFO", filter="queries")
 
 
 class SQLFetcher:

ghost_sql_sanitation/run.py

@@ -0,0 +1,11 @@
+from flask import Flask, make_response, jsonify
+from flask import current_app as app
+from ghost_sql_sanitation.queries import SQLFetcher
+from config import sql_folder
+
+
+def run_queries(db):
+    fetcher = SQLFetcher(sql_folder)
+    queries = fetcher.get_queries()
+    results = db.run_query(queries)
+    return make_response(jsonify(results), 200)

queries/meta-og-description.sql

@@ -6,4 +6,4 @@ SET
 WHERE
 	posts_meta.og_description IS NULL
 	AND posts.custom_excerpt IS NOT NULL
-	AND posts.id = posts_meta.post_id;;
+	AND posts.id = posts_meta.post_id;

queries/meta-og-image.sql

@@ -1,8 +1,8 @@
 UPDATE
-    posts,
+  posts,
 	posts_meta
 SET
 	posts_meta.og_image = posts.feature_image
 WHERE
-	posts.feature_image IS NOT NULL
+	posts.feature_image <> posts_meta.og_image
 	AND posts.id = posts_meta.post_id;

queries/meta-og-title.sql

@@ -6,4 +6,4 @@ SET
 WHERE
 	posts_meta.og_title IS NULL
 	AND posts.title IS NOT NULL
-	AND posts.id = posts_meta.post_id;;
+	AND posts.id = posts_meta.post_id;

queries/meta-title-remove-pipes.sql

@@ -1,4 +1,6 @@
 UPDATE
 	posts_meta
 SET
-	meta_title = REPLACE(meta_title, ' | ', ' - ');
+	meta_title = REPLACE(meta_title, ' | ', ' - ')
+WHERE
+	meta_title LIKE '%%|%%';

queries/meta-twitter-image.sql

@@ -1,8 +1,8 @@
 UPDATE
-    posts,
+	posts,
 	posts_meta
 SET
 	posts_meta.twitter_image = posts.feature_image
 WHERE
-	posts.feature_image IS NOT NULL
+	posts.feature_image <> posts_meta.twitter_image
 	AND posts.id = posts_meta.post_id;