Fix #12254 - Fix lookup of SRID for SQL Server layers

NathanW2 · NathanW2 · commit fedced84284f · 2015-06-19T13:56:38.000+10:00
Funded by TechnoglogyOne, Australia - Backported to 2.8.3 - Cherry-picked from 9c73a22
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -132,7 +132,9 @@ QgsMssqlProvider::QgsMssqlProvider( QString uri )
       mGeometryColName = anUri.geometryColumn();
 
     if ( mSRId < 0 || mWkbType == QGis::WKBUnknown || mGeometryColName.isEmpty() )
+    {
       loadMetadata();
+    }
     loadFields();
     UpdateStatistics( mUseEstimatedMetadata );
 
@@ -1324,7 +1326,11 @@ QgsCoordinateReferenceSystem QgsMssqlProvider::crs()
 {
   if ( !mCrs.isValid() && mSRId > 0 )
   {
-    // try to load crs
+    mCrs.createFromSrid( mSRId );
+    if ( mCrs.isValid() )
+      return mCrs;
+ 
+    // try to load crs from the database tables as a fallback
     QSqlQuery query = QSqlQuery( mDatabase );
     query.setForwardOnly( true );
     bool execOk = query.exec( QString( "select srtext from spatial_ref_sys where srid = %1" ).arg( QString::number( mSRId ) ) );
@@ -1336,6 +1342,8 @@ QgsCoordinateReferenceSystem QgsMssqlProvider::crs()
       query.finish();
     }
     query.clear();
+
+    // Look in the system reference table for the data if we can't find it yet
     execOk = query.exec( QString( "select well_known_text from sys.spatial_reference_systems where spatial_reference_id = %1" ).arg( QString::number( mSRId ) ) );
     if ( execOk && query.isActive() && query.next() && mCrs.createFromWkt( query.value( 0 ).toString() ) )
       return mCrs;
diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -527,6 +527,7 @@ void QgsMssqlSourceSelect::on_btnConnect_clicked()
   {
     QString testquery( "SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'geometry_columns'" );
     q.exec( testquery );
+    q.first();
     int count = q.value( 0 ).toInt();
     bool geometryColumnsFound = count != 0;
     if ( !geometryColumnsFound )

Original file line number	Diff line number	Diff line change
`@@ -527,6 +527,7 @@ void QgsMssqlSourceSelect::on_btnConnect_clicked()`
`527`	`527`	`{`
`528`	`528`	`QString testquery( "SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'geometry_columns'" );`
`529`	`529`	`q.exec( testquery );`
	`530`	`+ q.first();`
`530`	`531`	`int count = q.value( 0 ).toInt();`
`531`	`532`	`bool geometryColumnsFound = count != 0;`
`532`	`533`	`if ( !geometryColumnsFound )`