add more join types

src/parser/bison_parser.y

@@ -815,11 +815,15 @@ join_clause:
 		;
 
 opt_join_type:
-		INNER 	{ $$ = kJoinInner; }
+		INNER		{ $$ = kJoinInner; }
-	|	OUTER 	{ $$ = kJoinOuter; }
+	|	OUTER		{ $$ = kJoinOuter; }
-	|	LEFT 	{ $$ = kJoinLeft; }
+	|	LEFT OUTER	{ $$ = kJoinLeftOuter; }
-	|	RIGHT 	{ $$ = kJoinRight; }
+	|	RIGHT OUTER	{ $$ = kJoinRightOuter; }
-	|	/* empty, default */ 	{ $$ = kJoinInner; }
+	|	LEFT		{ $$ = kJoinLeft; }
+	|	RIGHT		{ $$ = kJoinRight; }
+	|	CROSS		{ $$ = kJoinCross; }
+	|	NATURAL		{ $$ = kJoinNatural; }
+	|	/* empty, default */	{ $$ = kJoinInner; }
 	;
 
 

src/sql/Table.h

@@ -47,6 +47,10 @@ namespace hsql {
     kJoinOuter,
     kJoinLeft,
     kJoinRight,
+    kJoinLeftOuter,
+    kJoinRightOuter,
+    kJoinCross,
+    kJoinNatural
   };
 
   // Definition of a join construct.