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

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/kexi/kexidb
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2006-10-06 16:24:18
Message-ID: 1160151858.850589.23152.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 593048 by staniek:

KexiDB
= fixed just introduced possible crash for expression columns

2.0: ported



 M  +6 -2      queryschema.cpp  


--- branches/koffice/1.6/koffice/kexi/kexidb/queryschema.cpp #593047:593048
@@ -1237,7 +1237,9 @@
 			//store alias and table.alias
 			if (!d->columnInfosByNameExpanded[ it.current()->alias ])
 				d->columnInfosByNameExpanded.insert( it.current()->alias, it.current() );
-			QString tableAndAlias( it.current()->field->table()->name() + "." + QString(it.current()->alias) );
+			QString tableAndAlias( it.current()->alias );
+			if (it.current()->field->table())
+				tableAndAlias.prepend(it.current()->field->table()->name() + ".");
 			if (!d->columnInfosByNameExpanded[ tableAndAlias ])
 				d->columnInfosByNameExpanded.insert( tableAndAlias, it.current() );
 			//the same for "unexpanded" list
@@ -1252,7 +1254,9 @@
 			//no alias: store name and table.name
 			if (!d->columnInfosByNameExpanded[ it.current()->field->name() ])
 				d->columnInfosByNameExpanded.insert( it.current()->field->name(), it.current() );
-			QString tableAndName( it.current()->field->table()->name() + "." + it.current()->field->name() );
+			QString tableAndName( it.current()->field->name() );
+			if (it.current()->field->table())
+				tableAndName.prepend(it.current()->field->table()->name() + ".");
 			if (!d->columnInfosByNameExpanded[ tableAndName ])
 				d->columnInfosByNameExpanded.insert( tableAndName, it.current() );
 			//the same for "unexpanded" list
[prev in list] [next in list] [prev in thread] [next in thread]