[Tora-cvs] SF.net SVN: tora:[4020] branches/tora-trotl/sandbox/tsqlparseoracle.cpp

[<ibr...@us...>]

Revision: 4020
          http://tora.svn.sourceforge.net/tora/?rev=4020&view=rev
Author:   ibre5041
Date:     2011-08-07 19:57:38 +0000 (Sun, 07 Aug 2011)

Log Message:
-----------


Modified Paths:
--------------
    branches/tora-trotl/sandbox/tsqlparseoracle.cpp

Modified: branches/tora-trotl/sandbox/tsqlparseoracle.cpp
===================================================================
--- branches/tora-trotl/sandbox/tsqlparseoracle.cpp	2011-08-07 19:57:05 UTC (rev 4019)
+++ branches/tora-trotl/sandbox/tsqlparseoracle.cpp	2011-08-07 19:57:38 UTC (rev 4020)
@@ -48,7 +48,14 @@
 				break;
 			case T_TABLE_ALIAS:
 				// Resolve grammar ambiguity: SELECT * FROM A INNER JOIN B; (=> INNER is not a table alias)
-				if( usagetype == T_DECL &&  (!str.compare("INNER", Qt::CaseInsensitive) || !str.compare("OUTER", Qt::CaseInsensitive)))
+				// The same for NATURAL JOIN, CROSS JOIN, LEFT/RIGHT OUTER JOIN
+				if( usagetype == T_DECL &&  (!str.compare("INNER", Qt::CaseInsensitive) ||
+							     !str.compare("CROSS", Qt::CaseInsensitive) ||							     
+							     !str.compare("NATURAL", Qt::CaseInsensitive) ||
+							     !str.compare("LEFT", Qt::CaseInsensitive) ||
+							     !str.compare("RIGHT", Qt::CaseInsensitive)
+					    )
+					)
 				{
 					_mTokenTypeRef = L_RESERVED;
 					_mUsageTypeRef = Unknown;
@@ -374,7 +381,7 @@
 							  << (*brother).toStringRecursive().toAscii().constData() << std::endl;
 						_mDeclarations.insertMulti(node.toString(), brother.data());
 						break;
-												
+						
 					}
 					if( brother->getTokenType() == Token::L_RESERVED)
 					{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.