add create vector table/tableUri/dropvectorTable

qgis · Jan 29, 2021 · ac6011d · ac6011d
1 parent 72ace46
commit ac6011d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/src/providers/oracle/qgsoracleproviderconnection.cpp b/src/providers/oracle/qgsoracleproviderconnection.cpp
@@ -23,6 +23,15 @@
 
 #include <QSqlRecord>
 
+const QStringList CONFIGURATION_PARAMETERS
+{
+  QStringLiteral( "geometryColumnsOnly" ),
+  QStringLiteral( "allowGeometrylessTables" ),
+  QStringLiteral( "disableInvalidGeometryHandling" ),
+  QStringLiteral( "saveUsername" ),
+  QStringLiteral( "savePassword" ),
+};
+
 QgsOracleProviderConnection::QgsOracleProviderConnection( const QString &name )
   : QgsAbstractDatabaseProviderConnection( name )
 {
@@ -31,6 +40,19 @@ QgsOracleProviderConnection::QgsOracleProviderConnection( const QString &name )
   const QRegularExpression removePartsRe { R"raw(\s*sql=\s*|\s*table=""\s*)raw" };
   setUri( QgsOracleConn::connUri( name ).uri().replace( removePartsRe, QString() ) );
   setDefaultCapabilities();
+
+  // load existing configuration
+  QgsSettings settings;
+  QVariantMap configuration;
+  for ( const auto &p : CONFIGURATION_PARAMETERS )
+  {
+    const QVariant v = settings.value( QStringLiteral( "/Oracle/connections/%1/%2" ).arg( name, p ) );
+    if ( v.isValid() )
+    {
+      configuration.insert( p, v );
+    }
+  }
+  setConfiguration( configuration );
 }
 
 QgsOracleProviderConnection::QgsOracleProviderConnection( const QString &uri, const QVariantMap &configuration ):
@@ -103,16 +125,7 @@ void QgsOracleProviderConnection::store( const QString &name ) const
   settings.setValue( "dboptions", dsUri.param( "dboptions" ) );
 
   // From configuration
-  static const QStringList configurationParameters
-  {
-    QStringLiteral( "allowGeometrylessTables" ),
-    QStringLiteral( "geometryColumnsOnly" ),
-    QStringLiteral( "onlyExistingTypes" ),
-    QStringLiteral( "savePassword" ),
-    QStringLiteral( "saveUsername" ),
-    QStringLiteral( "userTablesOnly" ),
-  };
-  for ( const auto &p : configurationParameters )
+  for ( const auto &p : CONFIGURATION_PARAMETERS )
   {
     if ( configuration().contains( p ) )
     {
@@ -264,6 +277,7 @@ QString QgsOracleProviderConnection::tableUri( const QString &schema, const QStr
   QgsDataSourceUri dsUri( uri() );
   dsUri.setTable( name );
   dsUri.setSchema( schema );
+  dsUri.setGeometryColumn( tableInfo.geometryColumn() );
   return dsUri.uri( false );
 }
 

diff --git a/src/providers/oracle/qgsoracleproviderconnection.h b/src/providers/oracle/qgsoracleproviderconnection.h
@@ -28,9 +28,20 @@ class QgsOracleProviderConnection : public QgsAbstractDatabaseProviderConnection
 
     // QgsAbstractProviderConnection interface
 
+    void createVectorTable( const QString &schema,
+                            const QString &name,
+                            const QgsFields &fields,
+                            QgsWkbTypes::Type wkbType,
+                            const QgsCoordinateReferenceSystem &srs, bool overwrite,
+                            const QMap<QString, QVariant> *options ) const override;
+
+    QString tableUri( const QString &schema, const QString &name ) const override;
+    void dropVectorTable( const QString &schema, const QString &name ) const override;
     void createSchema( const QString &name ) const override;
     void dropSchema( const QString &name, bool force = false ) const override;
 
+    QList<QgsAbstractDatabaseProviderConnection::TableProperty> tables( const QString &schema,
+        const TableFlags &flags = TableFlags() ) const override;
     QStringList schemas( ) const override;
     void store( const QString &name ) const override;
     void remove( const QString &name ) const override;

diff --git a/tests/src/python/test_qgsproviderconnection_base.py b/tests/src/python/test_qgsproviderconnection_base.py
@@ -177,8 +177,8 @@ def _test_operations(self, md, conn):
             self.assertFalse('myUtf8\U0001f604Table' in table_names)
             self.assertTrue('myNewTable' in table_names)
 
-            # insert something, because otherwise MSSQL cannot guess
-            if self.providerKey in ['hana', 'mssql']:
+            # insert something, because otherwise some databases cannot guess
+            if self.providerKey in ['hana', 'mssql', 'oracle']:
                 f = QgsFeature(fields)
                 f.setGeometry(QgsGeometry.fromWkt('LineString (-72.345 71.987, -80 80)'))
                 vl = QgsVectorLayer(conn.tableUri('myNewSchema', 'myNewTable'), 'vl', self.providerKey)

diff --git a/tests/src/python/test_qgsproviderconnection_oracle.py b/tests/src/python/test_qgsproviderconnection_oracle.py
@@ -32,7 +32,7 @@ class TestPyQgsProviderConnectionOracle(unittest.TestCase, TestPyQgsProviderConn
 
     # there is no service for oracle provider test so we need to save user and password
     # to keep them when storing/loading connections in parent class _test_save_load method
-    configuration = {"saveUsername": True, "savePassword": True}
+    configuration = {"saveUsername": True, "savePassword": True, "geometryColumnsOnly": True}
 
     @classmethod
     def setUpClass(cls):