From 33a40b63513c7ae3f47fe95670095034178cbf1f Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Sun, 1 Sep 2024 10:32:13 +0200
Subject: [PATCH] pass table and not table spec to column

This is important for table aliases which currently report
provided_tables_of and required_tables_of as table_t<Alias> only.

After this CL, they use table_alias_t<Alias, Spec>>
---
 include/sqlpp11/core/basic/column.h      | 2 +-
 include/sqlpp11/core/basic/table.h       | 2 +-
 include/sqlpp11/core/basic/table_alias.h | 5 ++---
 scripts/ddl2cpp                          | 2 +-
 tests/core/serialize/From.cpp            | 5 ++++-
 tests/core/usage/Sample.h                | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/sqlpp11/core/basic/column.h b/include/sqlpp11/core/basic/column.h
index ae6750d4..9cb12da2 100644
--- a/include/sqlpp11/core/basic/column.h
+++ b/include/sqlpp11/core/basic/column.h
@@ -110,7 +110,7 @@ namespace sqlpp
   template<typename Table, typename ColumnSpec>
   struct required_tables_of<column_t<Table, ColumnSpec>>
   {
-    using type = detail::type_vector<table_t<Table>>;
+    using type = detail::type_vector<Table>;
   };
 
   template <typename Table, typename ColumnSpec>
diff --git a/include/sqlpp11/core/basic/table.h b/include/sqlpp11/core/basic/table.h
index 62ddeeaa..55533810 100644
--- a/include/sqlpp11/core/basic/table.h
+++ b/include/sqlpp11/core/basic/table.h
@@ -37,7 +37,7 @@
 namespace sqlpp
 {
   template <typename TableSpec>
-  struct table_t : public TableSpec::_table_columns<TableSpec>, public enable_join<table_t<TableSpec>>
+  struct table_t : public TableSpec::_table_columns<table_t<TableSpec>>, public enable_join<table_t<TableSpec>>
   {
     using _traits = make_traits<no_value_t, tag::is_raw_table>;
 
diff --git a/include/sqlpp11/core/basic/table_alias.h b/include/sqlpp11/core/basic/table_alias.h
index 5d56e921..6baec4ab 100644
--- a/include/sqlpp11/core/basic/table_alias.h
+++ b/include/sqlpp11/core/basic/table_alias.h
@@ -36,7 +36,7 @@
 namespace sqlpp
 {
   template <typename AliasProvider, typename TableSpec>
-  struct table_alias_t : public TableSpec::_table_columns<AliasProvider>,
+  struct table_alias_t : public TableSpec::_table_columns<table_alias_t<AliasProvider, TableSpec>>,
                          public enable_join<table_alias_t<AliasProvider, TableSpec>>
   {
     using _nodes = detail::type_vector<>;
@@ -58,8 +58,7 @@ namespace sqlpp
   template <typename AliasProvider, typename TableSpec>
   struct provided_tables_of<table_alias_t<AliasProvider, TableSpec>>
   {
-#warning: This is a bit wonky... Maybe we should actually pass the table and not the table_spec into the column template.
-    using type = sqlpp::detail::type_vector<table_t<AliasProvider>>;
+    using type = sqlpp::detail::type_vector<table_alias_t<AliasProvider, TableSpec>>;
   };
 
   template <typename AliasProvider, typename TableSpec>
diff --git a/scripts/ddl2cpp b/scripts/ddl2cpp
index 757ada4d..33842836 100755
--- a/scripts/ddl2cpp
+++ b/scripts/ddl2cpp
@@ -728,7 +728,7 @@ def createHeader():
             if not columnHasDefault:
               if tableRequiredInsertColumns:
                 tableRequiredInsertColumns += ","
-              tableRequiredInsertColumns += "\n               sqlpp::column_t<" + tableSpec + ", " + columnClass + ">";
+              tableRequiredInsertColumns += "\n               sqlpp::column_t<sqlpp::table_t<" + tableSpec + ">, " + columnClass + ">";
         print("    SQLPP_NAME_TAG_FOR_SQL_AND_CPP("
             + escape_if_reserved(sqlTableName) + ", " + tableMember + ");"
             , file=header)
diff --git a/tests/core/serialize/From.cpp b/tests/core/serialize/From.cpp
index 57f8bf78..ee2c55ef 100644
--- a/tests/core/serialize/From.cpp
+++ b/tests/core/serialize/From.cpp
@@ -56,9 +56,12 @@ int From(int, char* [])
           " FROM tab_foo LEFT OUTER JOIN tab_bar ON tab_foo.double_n > tab_bar.id");
   SQLPP_COMPARE(from(foo.right_outer_join(bar).on(foo.doubleN > bar.id)),
           " FROM tab_foo RIGHT OUTER JOIN tab_bar ON tab_foo.double_n > tab_bar.id");
+  sqlpp::provided_tables_of_t<decltype(aFoo.cross_join(bFoo))>::hansi;
+  sqlpp::required_tables_of_t<decltype(aFoo.doubleN > bFoo.doubleN)>::hansi;
+#warning: reactivate
+  /*
   SQLPP_COMPARE(from(aFoo.join(bFoo).on(aFoo.doubleN > bFoo.doubleN)),
           " FROM tab_foo AS a INNER JOIN tab_foo AS b ON a.double_n > b.double_n");
-  /*
   SQLPP_COMPARE(from(aFoo.join(bFoo).on(aFoo.doubleN > bFoo.doubleN).join(cFoo).on(bFoo.doubleN > cFoo.doubleN)),
       " FROM tab_foo AS a INNER JOIN tab_foo AS b ON a.double_n > b.double_n INNER JOIN tab_foo AS c ON b.double_n > c.double_n");
   SQLPP_COMPARE(from(foo.join(bar).unconditionally()), " FROM tab_foo INNER JOIN tab_bar");
diff --git a/tests/core/usage/Sample.h b/tests/core/usage/Sample.h
index da315f07..265fa022 100644
--- a/tests/core/usage/Sample.h
+++ b/tests/core/usage/Sample.h
@@ -102,7 +102,7 @@ namespace test
                BoolNn,
                IntN>;
     using _required_insert_columns = sqlpp::detail::type_set<
-               sqlpp::column_t<TabBar_, BoolNn>>;
+               sqlpp::column_t<sqlpp::table_t<TabBar_>, BoolNn>>;
   };
   using TabBar = ::sqlpp::table_t<TabBar_>;