Skip to content

Commit

Permalink
[mssql] Fix some provider methods fail
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 2, 2018
1 parent 801fce7 commit dce7b19
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 51 deletions.
77 changes: 27 additions & 50 deletions src/providers/mssql/qgsmssqlprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void QgsMssqlProvider::loadMetadata()
mSRId = 0;
mWkbType = QgsWkbTypes::Unknown;

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
if ( !query.exec( QStringLiteral( "select f_geometry_column, srid, geometry_type from geometry_columns where f_table_schema = '%1' and f_table_name = '%2'" ).arg( mSchemaName, mTableName ) ) )
{
Expand All @@ -370,6 +370,15 @@ void QgsMssqlProvider::setLastError( const QString &error )
mLastError = error;
}

QSqlQuery QgsMssqlProvider::createQuery() const
{
if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
return QSqlQuery( mDatabase );
}

void QgsMssqlProvider::loadFields()
{
bool isIdentity = false;
Expand All @@ -378,7 +387,7 @@ void QgsMssqlProvider::loadFields()
mComputedColumns.clear();

// get field spec
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

// Get computed columns which need to be ignored on insert or update.
Expand Down Expand Up @@ -576,7 +585,8 @@ QVariant QgsMssqlProvider::minimumValue( int index ) const
sql += QStringLiteral( " where (%1)" ).arg( mSqlWhereClause );
}

QSqlQuery query = QSqlQuery( mDatabase );

QSqlQuery query = createQuery();
query.setForwardOnly( true );

if ( !query.exec( sql ) )
Expand Down Expand Up @@ -607,7 +617,7 @@ QVariant QgsMssqlProvider::maximumValue( int index ) const
sql += QStringLiteral( " where (%1)" ).arg( mSqlWhereClause );
}

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

if ( !query.exec( sql ) )
Expand Down Expand Up @@ -647,7 +657,7 @@ QSet<QVariant> QgsMssqlProvider::uniqueValues( int index, int limit ) const
sql += QStringLiteral( " where (%1)" ).arg( mSqlWhereClause );
}

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

if ( !query.exec( sql ) )
Expand Down Expand Up @@ -676,7 +686,7 @@ void QgsMssqlProvider::UpdateStatistics( bool estimate ) const
// get features to calculate the statistics
QString statement;

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

// Get the extents from the spatial index table to speed up load times.
Expand Down Expand Up @@ -803,7 +813,7 @@ long QgsMssqlProvider::featureCount() const

// If there is no subset set we can get the count from the system tables.
// Which is faster then doing select count(*)
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

QString sql = "SELECT rows"
Expand Down Expand Up @@ -844,11 +854,7 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList &flist, Flags flags )
statement = QStringLiteral( "INSERT INTO [%1].[%2] (" ).arg( mSchemaName, mTableName );

bool first = true;
if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

QgsAttributes attrs = it->attributes();
Expand Down Expand Up @@ -1098,11 +1104,7 @@ bool QgsMssqlProvider::addAttributes( const QList<QgsField> &attributes )
statement += QStringLiteral( "[%1] %2" ).arg( it->name(), type );
}

if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
if ( !query.exec( statement ) )
{
Expand Down Expand Up @@ -1130,12 +1132,7 @@ bool QgsMssqlProvider::deleteAttributes( const QgsAttributeIds &attributes )
statement += QStringLiteral( "[%1]" ).arg( mAttributeFields.at( *it ).name() );
}

if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

if ( !query.exec( statement ) )
Expand Down Expand Up @@ -1173,11 +1170,7 @@ bool QgsMssqlProvider::changeAttributeValues( const QgsChangedAttributesMap &att
QString statement = QStringLiteral( "UPDATE [%1].[%2] SET " ).arg( mSchemaName, mTableName );

bool first = true;
if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

for ( QgsAttributeMap::const_iterator it2 = attrs.begin(); it2 != attrs.end(); ++it2 )
Expand Down Expand Up @@ -1306,11 +1299,7 @@ bool QgsMssqlProvider::changeGeometryValues( const QgsGeometryMap &geometry_map
QString statement;
statement = QStringLiteral( "UPDATE [%1].[%2] SET " ).arg( mSchemaName, mTableName );

if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );

if ( mGeometryColType == QLatin1String( "geometry" ) )
Expand Down Expand Up @@ -1380,11 +1369,7 @@ bool QgsMssqlProvider::deleteFeatures( const QgsFeatureIds &id )
featureIds += ',' + FID_TO_STRING( *it );
}

if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
QString statement;
statement = QStringLiteral( "DELETE FROM [%1].[%2] WHERE [%3] IN (%4)" ).arg( mSchemaName,
Expand Down Expand Up @@ -1426,11 +1411,7 @@ bool QgsMssqlProvider::createSpatialIndex()
if ( mUseEstimatedMetadata )
UpdateStatistics( false );

if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
QString statement;
statement = QStringLiteral( "CREATE SPATIAL INDEX [qgs_%1_sidx] ON [%2].[%3] ( [%4] )" ).arg(
Expand Down Expand Up @@ -1458,11 +1439,7 @@ bool QgsMssqlProvider::createSpatialIndex()

bool QgsMssqlProvider::createAttributeIndex( int field )
{
if ( !mDatabase.isOpen() )
{
mDatabase = GetDatabase( mService, mHost, mDatabaseName, mUserName, mPassword );
}
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
QString statement;

Expand Down Expand Up @@ -1493,7 +1470,7 @@ QgsCoordinateReferenceSystem QgsMssqlProvider::crs() const
return mCrs;

// try to load crs from the database tables as a fallback
QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
bool execOk = query.exec( QStringLiteral( "select srtext from spatial_ref_sys where srid = %1" ).arg( QString::number( mSRId ) ) );
if ( execOk && query.isActive() )
Expand Down Expand Up @@ -1555,7 +1532,7 @@ bool QgsMssqlProvider::setSubsetString( const QString &theSQL, bool )
sql += QStringLiteral( " where %1" ).arg( mSqlWhereClause );
}

QSqlQuery query = QSqlQuery( mDatabase );
QSqlQuery query = createQuery();
query.setForwardOnly( true );
if ( !query.exec( sql ) )
{
Expand Down
4 changes: 3 additions & 1 deletion src/providers/mssql/qgsmssqlprovider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class QgsMssqlProvider : public QgsVectorDataProvider
mutable QgsWkbTypes::Type mWkbType = QgsWkbTypes::Unknown;

// The database object
QSqlDatabase mDatabase;
mutable QSqlDatabase mDatabase;

// The current sql query
QSqlQuery mQuery;
Expand Down Expand Up @@ -214,6 +214,8 @@ class QgsMssqlProvider : public QgsVectorDataProvider
// Sets the error messages
void setLastError( const QString &error );

QSqlQuery createQuery() const;

static void mssqlWkbTypeAndDimension( QgsWkbTypes::Type wkbType, QString &geometryType, int &dim );
static QgsWkbTypes::Type getWkbType( const QString &wkbType );

Expand Down

0 comments on commit dce7b19

Please sign in to comment.