Put SQL queries into separate files for better maintainability and to get statistics for SQL (#15)

Author: apolukhin

CMakeLists.txt

@@ -47,6 +47,15 @@ userver_target_generate_chaotic(${PROJECT_NAME}-chgen
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 target_link_libraries(${PROJECT_NAME}_objs PUBLIC ${PROJECT_NAME}-chgen)
+
+userver_add_sql_library(
+    ${PROJECT_NAME}_sql
+    NAMESPACE real_medium
+    OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}
+    SQL_FILES src/db/*.sql
+)
+target_link_libraries(${PROJECT_NAME}_objs PUBLIC ${PROJECT_NAME}_sql)
+
 target_link_libraries(${PROJECT_NAME}_objs PUBLIC cpp-jwt)
 
 find_package(ICU COMPONENTS uc i18n REQUIRED)

src/cache/articles_cache.cpp

@@ -4,8 +4,7 @@
 
 namespace real_medium::cache::articles_cache {
 
-userver::storages::postgres::Query ArticlesCachePolicy::kQuery =
-    userver::storages::postgres::Query(real_medium::sql::kSelectFullArticleInfo.c_str());
+userver::storages::postgres::Query ArticlesCachePolicy::kQuery = real_medium::sql::kSelectFullArticleInfo;
 
 void ArticlesCacheContainer::insert_or_assign(Key&& key, Article&& article) {
     auto article_ptr = std::make_shared<const Article>(std::move(article));

src/cache/comments_cache.cpp

@@ -8,8 +8,7 @@
 
 namespace real_medium::cache::comments_cache {
 
-userver::storages::postgres::Query CommentCachePolicy::kQuery =
-    userver::storages::postgres::Query(real_medium::sql::kSelectCachedComments.c_str());
+userver::storages::postgres::Query CommentCachePolicy::kQuery = real_medium::sql::kSelectCachedComments;
 
 void CommentsCacheContainer::insert_or_assign(
     real_medium::cache::comments_cache::CommentsCacheContainer::Key&& comment_id,

src/db/add_comment.sql

@@ -0,0 +1,17 @@
+WITH comment AS (
+    INSERT INTO real_medium.comments(body, user_id, article_id)
+    VALUES ($1, $2, $3)
+    RETURNING *
+)
+SELECT
+    comment.comment_id,
+    comment.created_at,
+    comment.updated_at,
+    comment.body,
+    (
+        SELECT
+            ROW(users.username, users.bio, users.image, false)::real_medium.profile
+        FROM real_medium.users
+        WHERE user_id = $2
+    ) AS author
+FROM comment

src/db/create_article.sql

@@ -0,0 +1 @@
+SELECT real_medium.create_article($1, $2, $3, $4, $5, $6)

src/db/decrement_favorites_count.sql

@@ -0,0 +1,3 @@
+UPDATE real_medium.articles
+SET favorites_count=favorites_count - 1
+WHERE article_id=$1

src/db/delete_article_by_slug.sql

@@ -0,0 +1 @@
+SELECT real_medium.delete_article_by_slug($1, $2)

src/db/delete_comment_by_id.sql

@@ -0,0 +1,3 @@
+DELETE FROM real_medium.comments
+WHERE comment_id = $1 AND user_id = $2
+RETURNING *

src/db/delete_favorite_pair.sql

@@ -0,0 +1,6 @@
+WITH tmp(article_id, user_id) AS (
+    SELECT article_id, $1 FROM real_medium.articles WHERE slug=$2
+)
+DELETE FROM real_medium.favorites
+WHERE (article_id, user_id) IN (SELECT article_id, user_id FROM tmp)
+RETURNING article_id

src/db/find_articles_by_filters.sql

@@ -0,0 +1 @@
+SELECT real_medium.get_articles_by_filters($1, $2, $3, $4, $5, $6)