追加

diff --git a/roast/include/roast/db/sql/index.hpp b/roast/include/roast/db/sql/index.hpp
index b5df2b2..183b59f 100644 (file)
--- a/roast/include/roast/db/sql/index.hpp
+++ b/roast/include/roast/db/sql/index.hpp
@@ -6,28 +6,14 @@
 #ifndef __SFJP_ROAST__db__sql__index_HPP__
 #define __SFJP_ROAST__db__sql__index_HPP__
 
+#include "roast/db/sql/sql_common.hpp"
+
 namespace roast
 {
        namespace sql
        {
                ///////////////////////////////////////////////////////////////////////////////////
                
-               namespace _char
-               {
-                       typedef chars::space space;
-               }
-               
-               namespace _op_names
-               {
-                       ROAST_LEXICAL_FIXSTR(create,"CREATE");
-                       ROAST_LEXICAL_FIXSTR(drop,"DROP");
-                       
-                       ROAST_LEXICAL_FIXSTR(index,"INDEX");
-                       ROAST_LEXICAL_FIXSTR(on,"ON");
-               }
-               
-               ///////////////////////////////////////////////////////////////////////////////////
-               
                //      CREATE INDEX
                template <typename TABLE_NAME, typename INDEX_NAME, typename INDEX_COLUMN_NAMES>
                class create_index : public seq<

diff --git a/roast/include/roast/db/sql/sql.hpp b/roast/include/roast/db/sql/sql.hpp
index 85dffe4..ac9d80d 100644 (file)
--- a/roast/include/roast/db/sql/sql.hpp
+++ b/roast/include/roast/db/sql/sql.hpp
@@ -10,6 +10,7 @@
 
 #include "roast/db/sql/table.hpp"
 #include "roast/db/sql/select.hpp"
+#include "roast/db/sql/join.hpp"
 #include "roast/db/sql/insert_update.hpp"
 #include "roast/db/sql/delete.hpp"
 #include "roast/db/sql/functions.hpp"