fix #3153

git-svn-id: http://svn.osgeo.org/qgis/trunk@14433 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

src/app/postgres/qgspgsourceselect.cpp

@@ -548,7 +548,10 @@ void QgsPgSourceSelect::setSql( const QModelIndex &index )
     return;
   }
 
-  QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( mProxyModel.mapToSource( index ) ), "querybuilder", "postgres" );
+  QModelIndex idx = mProxyModel.mapToSource( index );
+  QString tableName = mTableModel.itemFromIndex( idx.sibling( idx.row(), QgsDbTableModel::dbtmTable ) )->text();
+
+  QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( idx ), tableName, "postgres" );
 
   if ( !vlayer->isValid() )
   {

src/app/qgsquerybuilder.cpp

@@ -44,7 +44,7 @@ QgsQueryBuilder::QgsQueryBuilder( QgsVectorLayer *layer,
 
   mOrigSubsetString = layer->subsetString();
 
-  lblDataUri->setText( layer->publicSource() );
+  lblDataUri->setText( layer->name() );
   txtSQL->setText( mOrigSubsetString );
 
   populateFields();

src/core/qgsvectorlayer.cpp

@@ -4150,8 +4150,15 @@ void QgsVectorLayer::setCoordinateSystem()
   //we only nee to do that if the srs is not alreay valid
   if ( !mCRS->isValid() )
   {
-    mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );
-    mCRS->validate();
+    if ( geometryType() != QGis::NoGeometry )
+    {
+      mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );
+      mCRS->validate();
+    }
+    else
+    {
+      mCRS->createFromProj4( GEOPROJ4 );
+    }
   }
 }