sql/sql_common.hpp: select, joinも大体か

diff --git a/roast/include/roast/db/sql/sql_common.hpp b/roast/include/roast/db/sql/sql_common.hpp
index b2df69b..4bcae48 100644 (file)
--- a/roast/include/roast/db/sql/sql_common.hpp
+++ b/roast/include/roast/db/sql/sql_common.hpp
@@ -72,16 +72,27 @@ namespace roast
                        ROAST_LEXICAL_FIXSTR(from,"FROM");
                        ROAST_LEXICAL_FIXSTR(where,"WHERE");
                        ROAST_LEXICAL_FIXSTR(values,"VALUES");
+                       
+                       ROAST_LEXICAL_FIXSTR(all,"ALL");
+                       ROAST_LEXICAL_FIXSTR(distinct,"DISTINCT");
+                       ROAST_LEXICAL_FIXSTR(distinctrow,"DISTINCTROW");
+                       
+                       //      join.hpp
+                       ROAST_LEXICAL_FIXSTR(join,"JOIN");
+                       ROAST_LEXICAL_FIXSTR(straight_join,"STRAIGHT_JOIN");
+                       ROAST_LEXICAL_FIXSTR(inner,"INNER");
+                       ROAST_LEXICAL_FIXSTR(outer,"OUTER");
+                       ROAST_LEXICAL_FIXSTR(cross,"CROSS");
+                       ROAST_LEXICAL_FIXSTR(natural,"NATURAL");
+                       ROAST_LEXICAL_FIXSTR(left,"LEFT");
+                       ROAST_LEXICAL_FIXSTR(right,"RIGHT");
+                       ROAST_LEXICAL_FIXSTR(on,"ON");
 
                        ROAST_LEXICAL_FIXSTR(group_by,"GROUP BY");
                        ROAST_LEXICAL_FIXSTR(having,"HAVING");
                        ROAST_LEXICAL_FIXSTR(order_by,"ORDER BY");
                        ROAST_LEXICAL_FIXSTR(limit,"LIMIT");
                        
-                       ROAST_LEXICAL_FIXSTR(all,"ALL");
-                       ROAST_LEXICAL_FIXSTR(distinct,"DISTINCT");
-                       ROAST_LEXICAL_FIXSTR(distinctrow,"DISTINCTROW");
-                       
                        //      insert_update.hpp
                        ROAST_LEXICAL_FIXSTR(insert,"INSERT");
                        ROAST_LEXICAL_FIXSTR(into,"INTO");