Started adding support for SELECT statement.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@642 0109f412-320b-0410-ab79-c3e0c5ffbbe6

sql/src/sqlquery.h

@@ -246,8 +246,10 @@ typedef struct SQL_TABLE
 
 typedef struct SQL_COLUMN
 {
-	SQL_TABLE *	pTable;
-	FLMUINT		uiColumnNum;
+	const char *	pszTableAlias;
+	const char *	pszColumnName;
+	SQL_TABLE *		pTable;
+	FLMUINT			uiColumnNum;
 } SQL_COLUMN;
 
 typedef struct SQL_NODE
@@ -273,6 +275,13 @@ typedef struct SQL_NODE
 	} nd;
 } SQL_NODE;
 
+typedef struct SQL_ORDER_BY
+{
+	SQL_TABLE *		pTable;
+	FLMUINT			uiColumnNum;
+	SQL_ORDER_BY *	pNext;
+} SQL_ORDER_BY;
+
 FINLINE FLMBOOL isSQLNodeBool(
 	SQL_NODE *	pNode)
 {
@@ -332,6 +341,15 @@ public:
 		FLMUINT			uiTableNum,
 		SQL_TABLE **	ppTable);
 		
+	RCODE resolveColumnNames(
+		TABLE_ITEM *	pTableList);
+		
+	RCODE addColumn(
+		const char *	pszTableAlias,
+		FLMUINT			uiTableAliasLen,
+		const char *	pszColumnName,
+		FLMUINT			uiColumnNameLen);
+		
 	RCODE addColumn(
 		FLMUINT	uiTableNum,
 		FLMUINT	uiColumnNum);
@@ -399,6 +417,11 @@ public:
 				  : TRUE);
 	}
 	
+	RCODE orderBy(
+		FLMUINT	uiTableNum,
+		FLMUINT	uiColumnNum,
+		FLMBOOL	bDescending);
+	
 	RCODE getNext(
 		F_Row **	ppRow);
 	
@@ -488,6 +511,9 @@ private:
 	SQL_SUBQUERY *		m_pLastSubQuery;
 	SQL_TABLE *			m_pFirstTable;
 	SQL_TABLE *			m_pLastTable;
+	SQL_ORDER_BY *		m_pFirstOrderBy;
+	SQL_ORDER_BY *		m_pLastOrderBy;
+	FLMBOOL				m_bResolveNames;
 	FLMBOOL				m_bOptimized;
 	F_Database *		m_pDatabase;
 	F_Db *				m_pDb;