sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Woodrow 2015-06-19 11:36:00 +10:00
parent dbfbc69283
commit 9c73a22af5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/providers/mssql/qgsmssqlprovider.cpp
View File

@ -132,7 +132,9 @@ QgsMssqlProvider::QgsMssqlProvider( QString uri )
mGeometryColName = anUri.geometryColumn();
if ( mSRId < 0 || mWkbType == QGis::WKBUnknown || mGeometryColName.isEmpty() )
{
loadMetadata();
}
loadFields();
UpdateStatistics( mUseEstimatedMetadata );
@ -1354,7 +1356,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 ) ) );
@ -1366,6 +1372,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;

1
src/providers/mssql/qgsmssqlsourceselect.cpp
View File

@ -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 )