spatialite provider:

- fix #4569 - select newly added spatialite database
qgis · Jul 4, 2012 · 72d7a23 · 72d7a23
1 parent fd2f341
commit 72d7a23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -3600,13 +3600,6 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
   values = QString( ") VALUES (" );
   separator = "";
 
-  if ( !mPrimaryKey.isEmpty() )
-  {
-    sql += separator + quotedIdentifier( mPrimaryKey );
-    values += separator + "NULL";
-    separator = ",";
-  }
-
   if ( !mGeometryColumn.isNull() )
   {
     sql += separator + quotedIdentifier( mGeometryColumn );
@@ -3621,11 +3614,12 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
       continue;
 
     QString fieldname = fit->name();
-    if ( fieldname.isEmpty() || fieldname == mGeometryColumn || fieldname == mPrimaryKey )
+    if ( fieldname.isEmpty() || fieldname == mGeometryColumn )
       continue;
 
     sql += separator + quotedIdentifier( fieldname );
     values += separator + "?";
+    separator = ",";
   }
 
   sql += values;
@@ -3673,7 +3667,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList & flist )
         continue;
 
       QString fieldname = fit->name();
-      if ( fieldname.isEmpty() || fieldname == mGeometryColumn || fieldname == mPrimaryKey )
+      if ( fieldname.isEmpty() || fieldname == mGeometryColumn )
         continue;
 
       QVariant::Type type = fit->type();

diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp
@@ -493,6 +493,8 @@ void QgsSpatiaLiteSourceSelect::setConnectionListPosition()
   // If possible, set the item currently displayed database
   QString toSelect = settings.value( "/SpatiaLite/connections/selected" ).toString();
 
+  toSelect += "@" + settings.value( "/SpatiaLite/connections/" + toSelect + "/sqlitepath" ).toString();
+
   cmbConnections->setCurrentIndex( cmbConnections->findText( toSelect ) );
 
   if ( cmbConnections->currentIndex() < 0 )