[FEATURE] Improve SpatiaLite provider to manage non-spatial tables

qgis · Jun 30, 2011 · 890b092 · 890b092
1 parent 4d051b8
commit 890b092
Show file tree

Hide file tree

Showing 4 changed files with 268 additions and 264 deletions.
diff --git a/src/app/spatialite/qgsspatialitesourceselect.cpp b/src/app/spatialite/qgsspatialitesourceselect.cpp
@@ -91,7 +91,8 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QgisApp * app, Qt::WFlags
   mSearchModeComboBox->setVisible( false );
   mSearchModeLabel->setVisible( false );
   mSearchTableEdit->setVisible( false );
-  cbxAllowGeometrylessTables->setVisible( false );
+
+  cbxAllowGeometrylessTables->setDisabled( true );
 }
 
 // Slot for performing action when the Add button is clicked
@@ -113,6 +114,11 @@ void QgsSpatiaLiteSourceSelect::buildQuery()
   setSql( mTablesTreeView->currentIndex() );
 }
 
+void QgsSpatiaLiteSourceSelect::on_cbxAllowGeometrylessTables_stateChanged( int )
+{
+  on_btnConnect_clicked();
+}
+
 void QgsSpatiaLiteSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index )
 {
   mBuildQueryButton->setEnabled( index.parent().isValid() );
@@ -269,13 +275,8 @@ sqlite3 *QgsSpatiaLiteSourceSelect::openSpatiaLiteDb( QString path )
   if ( gcSpatiaLite && rsSpatiaLite )
     return handle;
 
-  // this one cannot be a valid SpatiaLite DB - no Spatial MetaData where found
-  closeSpatiaLiteDb( handle );
-  errCause = tr( "seems to be a valid SQLite DB, but not a SpatiaLite's one ..." );
-  QMessageBox::critical( this, tr( "SpatiaLite DB Open Error" ),
-                         tr( "Failure while connecting to: %1\n\n%2" ).arg( mSqlitePath ).arg( errCause ) );
-  mSqlitePath = "";
-  return NULL;
+  // this seems to be a valid SQLite DB, but not a SpatiaLite's one
+  return handle;
 
 error:
   // unexpected IO error
@@ -471,6 +472,8 @@ void QgsSpatiaLiteSourceSelect::on_btnConnect_clicked()
 {
   sqlite3 *handle;
 
+  cbxAllowGeometrylessTables->setEnabled( false );
+
   QSettings settings;
   QString subKey = cmbConnections->currentText();
   int idx = subKey.indexOf( "@" );
@@ -517,6 +520,8 @@ void QgsSpatiaLiteSourceSelect::on_btnConnect_clicked()
   }
   mTablesTreeView->resizeColumnToContents( 0 );
   mTablesTreeView->resizeColumnToContents( 1 );
+
+  cbxAllowGeometrylessTables->setEnabled( true );
 }
 
 QStringList QgsSpatiaLiteSourceSelect::selectedTables()
@@ -562,7 +567,7 @@ bool QgsSpatiaLiteSourceSelect::getTableInfo( sqlite3 * handle )
   int columns;
   char *errMsg = NULL;
   bool ok = false;
-  char sql[1024];
+  QString sql;
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
   // setting the SQLite DB name
@@ -571,9 +576,9 @@ bool QgsSpatiaLiteSourceSelect::getTableInfo( sqlite3 * handle )
   mTableModel.setSqliteDb( myName );
 
   // the following query return the tables containing a Geometry column
-  strcpy( sql, "SELECT f_table_name, f_geometry_column, type " );
-  strcat( sql, "FROM geometry_columns" );
-  ret = sqlite3_get_table( handle, sql, &results, &rows, &columns, &errMsg );
+  sql = "SELECT f_table_name, f_geometry_column, type "
+        "FROM geometry_columns";
+  ret = sqlite3_get_table( handle, sql.toUtf8(), &results, &rows, &columns, &errMsg );
   if ( ret != SQLITE_OK )
     goto error;
   if ( rows < 1 )
@@ -599,10 +604,10 @@ bool QgsSpatiaLiteSourceSelect::getTableInfo( sqlite3 * handle )
   if ( checkViewsGeometryColumns( handle ) )
   {
     // the following query return the views supporting a Geometry column
-    strcpy( sql, "SELECT view_name, view_geometry, type " );
-    strcat( sql, "FROM views_geometry_columns " );
-    strcat( sql, "JOIN geometry_columns USING (f_table_name, f_geometry_column)" );
-    ret = sqlite3_get_table( handle, sql, &results, &rows, &columns, &errMsg );
+    sql = "SELECT view_name, view_geometry, type "
+          "FROM views_geometry_columns "
+          "JOIN geometry_columns USING (f_table_name, f_geometry_column)";
+    ret = sqlite3_get_table( handle, sql.toUtf8(), &results, &rows, &columns, &errMsg );
     if ( ret != SQLITE_OK )
       goto error;
     if ( rows < 1 )
@@ -627,9 +632,9 @@ bool QgsSpatiaLiteSourceSelect::getTableInfo( sqlite3 * handle )
   if ( checkVirtsGeometryColumns( handle ) )
   {
     // the following query return the VirtualShapefiles
-    strcpy( sql, "SELECT virt_name, virt_geometry, type " );
-    strcat( sql, "FROM virts_geometry_columns" );
-    ret = sqlite3_get_table( handle, sql, &results, &rows, &columns, &errMsg );
+    sql = "SELECT virt_name, virt_geometry, type "
+          "FROM virts_geometry_columns";
+    ret = sqlite3_get_table( handle, sql.toUtf8(), &results, &rows, &columns, &errMsg );
     if ( ret != SQLITE_OK )
       goto error;
     if ( rows < 1 )
@@ -651,6 +656,29 @@ bool QgsSpatiaLiteSourceSelect::getTableInfo( sqlite3 * handle )
     sqlite3_free_table( results );
   }
 
+  if ( cbxAllowGeometrylessTables->isChecked() )
+  {
+    // get all tables
+    sql = "SELECT name "
+          "FROM sqlite_master "
+          "WHERE type in ('table', 'view')";
+    ret = sqlite3_get_table( handle, sql.toUtf8(), &results, &rows, &columns, &errMsg );
+    if ( ret != SQLITE_OK )
+      goto error;
+    if ( rows < 1 )
+      ;
+    else
+    {
+      for ( i = 1; i <= rows; i++ )
+      {
+        QString tableName = QString::fromUtf8( results[( i * columns ) + 0] );
+        mTableModel.addTableEntry( tr( "No geometry" ), tableName, QString::null, "" );
+      }
+      ok = true;
+    }
+    sqlite3_free_table( results );
+  }
+
   QApplication::restoreOverrideCursor();
   return ok;
 

diff --git a/src/app/spatialite/qgsspatialitesourceselect.h b/src/app/spatialite/qgsspatialitesourceselect.h
@@ -85,6 +85,7 @@ class QgsSpatiaLiteSourceSelect: public QDialog, private Ui::QgsDbSourceSelectBa
     void on_mSearchTableEdit_textChanged( const QString & text );
     void on_mSearchColumnComboBox_currentIndexChanged( const QString & text );
     void on_mSearchModeComboBox_currentIndexChanged( const QString & text );
+    void on_cbxAllowGeometrylessTables_stateChanged( int );
     void setSql( const QModelIndex& index );
     void on_cmbConnections_activated( int );
     void setLayerType( QString table, QString column, QString type );