From 080bf60357992a7f315868853b3aab77a356db0b Mon Sep 17 00:00:00 2001 From: Yevgeniy Zakharov Date: Mon, 2 Oct 2023 21:23:54 +0600 Subject: [PATCH] added schema folder --- dev/eponymous_vtabs/dbstat.h | 4 ++-- dev/implementations/column_definitions.h | 2 +- dev/implementations/table_definitions.h | 4 ++-- dev/{ => schema}/column.h | 0 dev/{ => schema}/index.h | 0 dev/{ => schema}/table.h | 0 dev/{ => schema}/triggers.h | 0 dev/sqlite_schema_table.h | 4 ++-- dev/statement_serializer.h | 6 ++--- dev/storage.h | 8 +++---- include/sqlite_orm/sqlite_orm.h | 28 ++++++++++++------------ third_party/amalgamate/config.json | 8 +++---- 12 files changed, 32 insertions(+), 32 deletions(-) rename dev/{ => schema}/column.h (100%) rename dev/{ => schema}/index.h (100%) rename dev/{ => schema}/table.h (100%) rename dev/{ => schema}/triggers.h (100%) diff --git a/dev/eponymous_vtabs/dbstat.h b/dev/eponymous_vtabs/dbstat.h index 7ac28a428..1b674ed9b 100644 --- a/dev/eponymous_vtabs/dbstat.h +++ b/dev/eponymous_vtabs/dbstat.h @@ -4,8 +4,8 @@ #include // std::string #endif -#include "../column.h" -#include "../table.h" +#include "../schema/column.h" +#include "../schema/table.h" namespace sqlite_orm { #ifdef SQLITE_ENABLE_DBSTAT_VTAB diff --git a/dev/implementations/column_definitions.h b/dev/implementations/column_definitions.h index e98d99dce..f8b70f508 100644 --- a/dev/implementations/column_definitions.h +++ b/dev/implementations/column_definitions.h @@ -12,7 +12,7 @@ #include "../tuple_helper/tuple_filter.h" #include "../tuple_helper/tuple_traits.h" #include "../default_value_extractor.h" -#include "../column.h" +#include "../schema/column.h" namespace sqlite_orm { namespace internal { diff --git a/dev/implementations/table_definitions.h b/dev/implementations/table_definitions.h index e94c50fdd..8e3c24268 100644 --- a/dev/implementations/table_definitions.h +++ b/dev/implementations/table_definitions.h @@ -9,8 +9,8 @@ #include "../functional/cxx_universal.h" // ::size_t #include "../type_printer.h" -#include "../column.h" -#include "../table.h" +#include "../schema/column.h" +#include "../schema/table.h" namespace sqlite_orm { namespace internal { diff --git a/dev/column.h b/dev/schema/column.h similarity index 100% rename from dev/column.h rename to dev/schema/column.h diff --git a/dev/index.h b/dev/schema/index.h similarity index 100% rename from dev/index.h rename to dev/schema/index.h diff --git a/dev/table.h b/dev/schema/table.h similarity index 100% rename from dev/table.h rename to dev/schema/table.h diff --git a/dev/triggers.h b/dev/schema/triggers.h similarity index 100% rename from dev/triggers.h rename to dev/schema/triggers.h diff --git a/dev/sqlite_schema_table.h b/dev/sqlite_schema_table.h index d84a6c030..8063fa072 100644 --- a/dev/sqlite_schema_table.h +++ b/dev/sqlite_schema_table.h @@ -2,8 +2,8 @@ #include // std::string -#include "column.h" -#include "table.h" +#include "schema/column.h" +#include "schema/table.h" #include "alias.h" namespace sqlite_orm { diff --git a/dev/statement_serializer.h b/dev/statement_serializer.h index db5a8c1ba..28ba244b5 100644 --- a/dev/statement_serializer.h +++ b/dev/statement_serializer.h @@ -26,7 +26,7 @@ #include "core_functions.h" #include "constraints.h" #include "conditions.h" -#include "column.h" +#include "schema/column.h" #include "indexed_column.h" #include "function.h" #include "prepared_statement.h" @@ -41,9 +41,9 @@ #include "serializing_util.h" #include "statement_binder.h" #include "values.h" -#include "triggers.h" +#include "schema/triggers.h" #include "table_type_of.h" -#include "index.h" +#include "schema/index.h" #include "util.h" namespace sqlite_orm { diff --git a/dev/storage.h b/dev/storage.h index dd26ab1fc..023ae27f5 100644 --- a/dev/storage.h +++ b/dev/storage.h @@ -45,11 +45,11 @@ #include "prepared_statement.h" #include "expression_object_type.h" #include "statement_serializer.h" -#include "triggers.h" +#include "schema/triggers.h" #include "object_from_column_builder.h" -#include "table.h" -#include "column.h" -#include "index.h" +#include "schema/table.h" +#include "schema/column.h" +#include "schema/index.h" #include "util.h" #include "serializing_util.h" diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h index b82076898..bbdf042ad 100644 --- a/include/sqlite_orm/sqlite_orm.h +++ b/include/sqlite_orm/sqlite_orm.h @@ -15197,7 +15197,7 @@ namespace sqlite_orm { // #include "conditions.h" -// #include "column.h" +// #include "schema/column.h" // #include "indexed_column.h" @@ -15429,11 +15429,11 @@ namespace sqlite_orm { // #include "values.h" -// #include "triggers.h" +// #include "schema/triggers.h" // #include "table_type_of.h" -// #include "index.h" +// #include "schema/index.h" // #include "util.h" @@ -17420,15 +17420,15 @@ namespace sqlite_orm { } } -// #include "triggers.h" +// #include "schema/triggers.h" // #include "object_from_column_builder.h" -// #include "table.h" +// #include "schema/table.h" -// #include "column.h" +// #include "schema/column.h" -// #include "index.h" +// #include "schema/index.h" // #include "util.h" @@ -19457,9 +19457,9 @@ namespace sqlite_orm { #include // std::string -// #include "column.h" +// #include "schema/column.h" -// #include "table.h" +// #include "schema/table.h" // #include "alias.h" @@ -19504,9 +19504,9 @@ namespace sqlite_orm { #include // std::string #endif -// #include "../column.h" +// #include "../schema/column.h" -// #include "../table.h" +// #include "../schema/table.h" namespace sqlite_orm { #ifdef SQLITE_ENABLE_DBSTAT_VTAB @@ -19564,7 +19564,7 @@ namespace sqlite_orm { // #include "../default_value_extractor.h" -// #include "../column.h" +// #include "../schema/column.h" namespace sqlite_orm { namespace internal { @@ -19603,9 +19603,9 @@ namespace sqlite_orm { // ::size_t // #include "../type_printer.h" -// #include "../column.h" +// #include "../schema/column.h" -// #include "../table.h" +// #include "../schema/table.h" namespace sqlite_orm { namespace internal { diff --git a/third_party/amalgamate/config.json b/third_party/amalgamate/config.json index 21d8a0659..a3e62a7a4 100755 --- a/third_party/amalgamate/config.json +++ b/third_party/amalgamate/config.json @@ -11,7 +11,7 @@ "dev/constraints.h", "dev/type_is_nullable.h", "dev/operators.h", - "dev/column.h", + "dev/schema/column.h", "dev/field_printer.h", "dev/conditions.h", "dev/alias.h", @@ -19,7 +19,7 @@ "dev/typed_comparator.h", "dev/select_constraints.h", "dev/table_info.h", - "dev/triggers.h", + "dev/schema/triggers.h", "dev/statement_finalizer.h", "dev/arithmetic_tag.h", "dev/pointer_value.h", @@ -27,9 +27,9 @@ "dev/row_extractor.h", "dev/util.h", "dev/sync_schema_result.h", - "dev/index.h", + "dev/schema/index.h", "dev/rowid.h", - "dev/table.h", + "dev/schema/table.h", "dev/storage_impl.h", "dev/default_value_extractor.h", "dev/storage.h",