From e527abb455ede574431702aa99cfc883e18df8a9 Mon Sep 17 00:00:00 2001 From: rylek Date: Tue, 29 Dec 2009 07:33:49 +0000 Subject: [PATCH] SchemaAlias improvement git-svn-id: svn://ultimatepp.org/upp/trunk@1852 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/TSql/util.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uppsrc/TSql/util.cpp b/uppsrc/TSql/util.cpp index a9657fc65..8976edfa4 100644 --- a/uppsrc/TSql/util.cpp +++ b/uppsrc/TSql/util.cpp @@ -569,12 +569,15 @@ SqlVal Alias(const SqlVal& value, const SqlVal& alias) SqlVal SchemaAlias(const SqlVal& table, const SqlVal& alias) { - return SqlCol(~SchemaTable(table) + SqlCase(MSSQL, " as ")(" ") + ~alias); + SqlVal st = SchemaTable(table); + if(~st == ~alias) + return st; + return Alias(st, alias); } SqlVal SchemaAlias(const SqlVal& table) { - return SqlCol(~SchemaTable(table) + SqlCase(MSSQL, " as ")(" ") + ~table); + return SchemaAlias(table, table); } SqlId SchemaId(SqlId table_id)