feat cmake: use GLOB_RECURSE in userver_add_sql_library

Closes: #1006
commit_hash:c6696910dfc67cd583d77ec0ec04dbb4baf558ba

Author: Anton3

.mapping.json

@@ -3777,11 +3777,11 @@
   "samples/postgres_cache_order_by/tests/static/test_data.sql":"taxi/uservices/userver/samples/postgres_cache_order_by/tests/static/test_data.sql",
   "samples/postgres_cache_order_by/tests/test_cache_order_by.py":"taxi/uservices/userver/samples/postgres_cache_order_by/tests/test_cache_order_by.py",
   "samples/postgres_service/CMakeLists.txt":"taxi/uservices/userver/samples/postgres_service/CMakeLists.txt",
-  "samples/postgres_service/delete_value.sql":"taxi/uservices/userver/samples/postgres_service/delete_value.sql",
-  "samples/postgres_service/insert_value.sql":"taxi/uservices/userver/samples/postgres_service/insert_value.sql",
   "samples/postgres_service/main.cpp":"taxi/uservices/userver/samples/postgres_service/main.cpp",
+  "samples/postgres_service/queries/read/select_value.sql":"taxi/uservices/userver/samples/postgres_service/queries/read/select_value.sql",
+  "samples/postgres_service/queries/write/delete_value.sql":"taxi/uservices/userver/samples/postgres_service/queries/write/delete_value.sql",
+  "samples/postgres_service/queries/write/insert_value.sql":"taxi/uservices/userver/samples/postgres_service/queries/write/insert_value.sql",
   "samples/postgres_service/schemas/postgresql/admin.sql":"taxi/uservices/userver/samples/postgres_service/schemas/postgresql/admin.sql",
-  "samples/postgres_service/select_value.sql":"taxi/uservices/userver/samples/postgres_service/select_value.sql",
   "samples/postgres_service/static_config.yaml":"taxi/uservices/userver/samples/postgres_service/static_config.yaml",
   "samples/postgres_service/tests/conftest.py":"taxi/uservices/userver/samples/postgres_service/tests/conftest.py",
   "samples/postgres_service/tests/test_postgres.py":"taxi/uservices/userver/samples/postgres_service/tests/test_postgres.py",

cmake/UserverSql.cmake

@@ -20,7 +20,7 @@ _userver_prepare_sql()
 
 function(userver_add_sql_library TARGET)
     set(OPTIONS)
-    set(ONE_VALUE_ARGS OUTPUT_DIR NAMESPACE QUERY_LOG_MODE)
+    set(ONE_VALUE_ARGS SOURCE_DIR OUTPUT_DIR NAMESPACE QUERY_LOG_MODE)
     set(MULTI_VALUE_ARGS SQL_FILES)
     cmake_parse_arguments(ARG "${OPTIONS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
     if(NOT ARG_NAMESPACE)
@@ -30,12 +30,19 @@ function(userver_add_sql_library TARGET)
         set(ARG_QUERY_LOG_MODE "full")
     endif()
     set(FILENAME "sql_queries")
+    if(NOT ARG_SOURCE_DIR)
+        set(ARG_SOURCE_DIR ".")
+    endif()
+    if(NOT IS_ABSOLUTE "${ARG_SOURCE_DIR}")
+        set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SOURCE_DIR}")
+    endif()
 
     set(SQL_FILES)
     foreach(WILDCARD ${ARG_SQL_FILES})
-        file(GLOB FILES ${WILDCARD})
+        file(GLOB_RECURSE FILES RELATIVE ${ARG_SOURCE_DIR} "${ARG_SOURCE_DIR}/${WILDCARD}")
         list(APPEND SQL_FILES ${FILES})
     endforeach()
+    list(TRANSFORM SQL_FILES PREPEND "${ARG_SOURCE_DIR}/")
 
     get_property(USERVER_SQL_PYTHON_BINARY GLOBAL PROPERTY userver_sql_python_binary)
     get_property(USERVER_SQL_SCRIPTS_PATH GLOBAL PROPERTY userver_scripts_sql)
@@ -50,7 +57,8 @@ function(userver_add_sql_library TARGET)
         OUTPUT ${output_files}
         COMMAND
             ${USERVER_SQL_PYTHON_BINARY} ${USERVER_SQL_SCRIPTS_PATH}/generator.py --namespace ${ARG_NAMESPACE}
-            --output-dir ${ARG_OUTPUT_DIR} --query-log-mode ${ARG_QUERY_LOG_MODE} --testsuite-output-dir
+            --source-dir ${ARG_SOURCE_DIR} --output-dir ${ARG_OUTPUT_DIR}
+            --query-log-mode ${ARG_QUERY_LOG_MODE} --testsuite-output-dir
             ${TESTSUITE_OUTPUT_DIR} ${SQL_FILES} ${CODEGEN}
         DEPENDS ${SQL_FILES}
     )

samples/postgres_service/CMakeLists.txt

@@ -15,6 +15,8 @@ userver_add_sql_library(
     ${PROJECT_NAME}_sql
     NAMESPACE
     samples_postgres_service
+    SOURCE_DIR
+    queries
     OUTPUT_DIR
     ${CMAKE_CURRENT_BINARY_DIR}
     SQL_FILES

samples/postgres_service/select_value.sql renamed to samples/postgres_service/queries/read/select_value.sql

@@ -1,6 +1,6 @@
-# External SQL/YQL files
+# Embedding SQL/YQL files via userver_add_sql_library
 
-You may generate SQL queries or YQL queries (for YDB) from external .sql/.yql files.
+You may generate SQL queries or YQL queries (for YDB) from `.sql` / `.yql` files.
 To do this, call the following cmake function in your CMakeLists.txt:
 
 @snippet samples/postgres_service/CMakeLists.txt Postgres service sample - CMakeLists.txt

samples/postgres_service/delete_value.sql renamed to samples/postgres_service/queries/write/delete_value.sql

@@ -55,9 +55,9 @@ KeyValue component only uses the thread safe DB client. In more complex cases
 We can generate the necessary `storages::Query` objects from external SQL/YQL files.
 
 In our case, we have the following files:
-* @ref samples/postgres_service/select_value.sql
-* @ref samples/postgres_service/insert_value.sql
-* @ref samples/postgres_service/delete_value.sql
+* @ref samples/postgres_service/queries/read/select_value.sql
+* @ref samples/postgres_service/queries/write/insert_value.sql
+* @ref samples/postgres_service/queries/write/delete_value.sql
 
 From which we will get:
 @code{.hpp}
@@ -225,6 +225,6 @@ See the full example:
 @example samples/postgres_service/CMakeLists.txt
 @example samples/postgres_service/tests/conftest.py
 @example samples/postgres_service/tests/test_postgres.py
-@example samples/postgres_service/select_value.sql
-@example samples/postgres_service/insert_value.sql
-@example samples/postgres_service/delete_value.sql
+@example samples/postgres_service/queries/read/select_value.sql
+@example samples/postgres_service/queries/write/insert_value.sql
+@example samples/postgres_service/queries/write/delete_value.sql

samples/postgres_service/insert_value.sql renamed to samples/postgres_service/queries/write/insert_value.sql

@@ -34,11 +34,17 @@ def parse_args():
         required=True,
         help='C++ namespace to use',
     )
+    parser.add_argument(
+        '--source-dir',
+        type=str,
+        required=True,
+        help='path to the directory with .sql files',
+    )
     parser.add_argument(
         '--output-dir',
         type=str,
         required=True,
-        help='full path to output .hpp file',
+        help='path to the directory with .hpp-.cpp files to generate',
     )
     parser.add_argument(
         '--query-log-mode',
@@ -53,7 +59,7 @@ def parse_args():
         required=True,
         help='full path to generated tests',
     )
-    parser.add_argument('files', nargs='*', help='input .sql files to process')
+    parser.add_argument('files', nargs='*', help='input .sql files to process (relative to the cwd, not source-dir)')
     return parser.parse_args()
 
 
@@ -97,7 +103,7 @@ def read_items(args) -> List[SqlQuery]:
         name = pathlib.Path(filename).stem  # TODO: CamelCase
         items.append(
             SqlQuery(
-                source=filename,
+                source=os.path.relpath(filename, args.source_dir),
                 contents=content,
                 name=name,
                 variable=('k' + camel_case(name)),