[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/kexidb
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2004-09-16 22:16:27
Message-ID: 20040916221627.5283D175C () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

KexiDB 
- Connection::selectStatement(): alias is used insetead of table name, 
  if available


  M +9 -1      connection.cpp   1.96


--- koffice/kexi/kexidb/connection.cpp  #1.95:1.96
@@ -968,5 +968,13 @@ QString Connection::selectStatement( Kex
                                 if (!f->table()) //sanity check
                                         return QString::null;
-                                sql += (escapeIdentifier(f->table()->name()) + "." + escapeIdentifier(f->name()));
+                                        
+                                QString tableName;
+                                int tablePosition = querySchema.tableBoundToColumn(number);
+                                if (tablePosition>=0)
+                                        tableName = querySchema.tableAlias(tablePosition);
+                                if (tableName.isEmpty())
+                                        tableName = f->table()->name();
+                                        
+                                sql += (escapeIdentifier(tableName) + "." + escapeIdentifier(f->name()));
                                 QString aliasString = QString(querySchema.columnAlias(number));
                                 if (!aliasString.isEmpty())


[prev in list] [next in list] [prev in thread] [next in thread]