Skip to content

Commit

Permalink
update postgis support to use st_ variants instead of old deprecated
Browse files Browse the repository at this point in the history 
(and now removed) versions.

git-svn-id: http://svn.osgeo.org/qgis/trunk@15023 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jan 12, 2011
1 parent 65e5956 commit 21c2461
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions src/app/postgres/qgspgsourceselect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,15 @@ QString QgsPgSourceSelect::layerURI( const QModelIndex &index )

if ( typeName == "POINT" )
{
geomFilter = QString( "GeometryType(\"%1\") IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
geomFilter = QString( "st_geometrytype(\"%1\") IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
}
else if ( typeName == "LINESTRING" )
{
geomFilter = QString( "GeometryType(\"%1\") IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
geomFilter = QString( "st_geometrytype(\"%1\") IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
}
else if ( typeName == "POLYGON" )
{
geomFilter = QString( "GeometryType(\"%1\") IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
geomFilter = QString( "st_geometrytype(\"%1\") IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
}

if ( !geomFilter.isEmpty() && !sql.contains( geomFilter ) )
Expand Down Expand Up @@ -941,9 +941,9 @@ void QgsGeomColumnTypeThread::getLayerTypes()
{
QString query = QString( "select distinct "
"case"
" when geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" when st_geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when st_geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when st_geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" end "
"from " ).arg( "\"" + columns[i] + "\"" );
if ( mUseEstimatedMetadata )
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/qgsshapefile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ bool QgsShapeFile::insertLayer( QString dbname, QString schema, QString primary_
values += val;
}
query += "," + QgsPgUtil::quotedIdentifier( geom_col );
values += QString( ",GeometryFromText(%1,%2)" )
values += QString( ",st_geometryfromtext(%1,%2)" )
.arg( QgsPgUtil::quotedValue( geometry ) )
.arg( srid );

Expand Down
32 changes: 16 additions & 16 deletions src/providers/postgres/qgspostgresprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,14 +569,14 @@ void QgsPostgresProvider::select( QgsAttributeList fetchAttributes, QgsRectangle
{
// Contributed by #qgis irc "creeping"
// This version actually invokes PostGIS's use of spatial indexes
whereClause = QString( "%1 && setsrid('BOX3D(%2)'::box3d,%3) and intersects(%1,setsrid('BOX3D(%2)'::box3d,%3))" )
whereClause = QString( "%1 && st_setsrid('BOX3D(%2)'::box3d,%3) and st_intersects(%1,st_setsrid('BOX3D(%2)'::box3d,%3))" )
.arg( quotedIdentifier( geometryColumn ) )
.arg( rect.asWktCoordinates() )
.arg( srid );
}
else
{
whereClause = QString( "%1 && setsrid('BOX3D(%2)'::box3d,%3)" )
whereClause = QString( "%1 && st_setsrid('BOX3D(%2)'::box3d,%3)" )
.arg( quotedIdentifier( geometryColumn ) )
.arg( rect.asWktCoordinates() )
.arg( srid );
Expand Down Expand Up @@ -2032,12 +2032,12 @@ bool QgsPostgresProvider::parseDomainCheckConstraint( QStringList& enumValues, c
enumValues.clear();

//is it a domain type with a check constraint?
QString domainSql = QString( "SELECT domain_name from information_schema.columns where table_name = %1 and column_name = %2" ).arg( quotedValue( mTableName ) ).arg( quotedValue( attributeName ) );
QString domainSql = QString( "SELECT domain_name from information_schema.columns where table_name=%1 and column_name=%2" ).arg( quotedValue( mTableName ) ).arg( quotedValue( attributeName ) );
Result domainResult = connectionRO->PQexec( domainSql );
if ( PQresultStatus( domainResult ) == PGRES_TUPLES_OK && PQntuples( domainResult ) > 0 )
{
//a domain type
QString domainCheckDefinitionSql = QString( "SELECT consrc FROM pg_constraint where conname = (SELECT constraint_name FROM information_schema.domain_constraints WHERE domain_name = %1)" ).arg( quotedValue( PQgetvalue( domainResult, 0, 0 ) ) );
QString domainCheckDefinitionSql = QString( "SELECT consrc FROM pg_constraint where conname=(SELECT constraint_name FROM information_schema.domain_constraints WHERE domain_name=%1)" ).arg( quotedValue( PQgetvalue( domainResult, 0, 0 ) ) );
Result domainCheckRes = connectionRO->PQexec( domainCheckDefinitionSql );
if ( PQresultStatus( domainCheckRes ) == PGRES_TUPLES_OK && PQntuples( domainCheckRes ) > 0 )
{
Expand All @@ -2048,7 +2048,7 @@ bool QgsPostgresProvider::parseDomainCheckConstraint( QStringList& enumValues, c
//normally, postgresql creates that if the contstraint has been specified as 'VALUE in ('a', 'b', 'c', 'd')

//todo: ANY must occure before ARRAY
int anyPos = checkDefinition.indexOf( "VALUE = ANY" );
int anyPos = checkDefinition.indexOf( "VALUE=ANY" );
int arrayPosition = checkDefinition.lastIndexOf( "ARRAY[" );
int closingBracketPos = checkDefinition.indexOf( "]", arrayPosition + 6 );

Expand Down Expand Up @@ -2274,7 +2274,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
if ( !geometryColumn.isNull() )
{
insert += quotedIdentifier( geometryColumn );
values += QString( "GeomFromWKB($%1%2,%3)" )
values += QString( "st_geomfromwkb($%1%2,%3)" )
.arg( offset )
.arg( connectionRW->useWkbHex() ? "" : "::bytea" )
.arg( srid );
Expand Down Expand Up @@ -2346,7 +2346,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
}
else if ( fit->typeName() == "geometry" )
{
values += QString( "%1geomfromewkt(%2)" ).arg( delim ).arg( quotedValue( it->toString() ) );
values += QString( "%1st_geomfromewkt(%2)" ).arg( delim ).arg( quotedValue( it->toString() ) );
}
else if ( fit->typeName() == "geography" )
{
Expand All @@ -2362,7 +2362,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
// value is not unique => add parameter
if ( fit->typeName() == "geometry" )
{
values += QString( "%1geomfromewkt($%2)" ).arg( delim ).arg( defaultValues.size() + offset );
values += QString( "%1st_geomfromewkt($%2)" ).arg( delim ).arg( defaultValues.size() + offset );
}
else if ( fit->typeName() == "geography" )
{
Expand Down Expand Up @@ -2632,7 +2632,7 @@ bool QgsPostgresProvider::changeAttributeValues( const QgsChangedAttributesMap &
else
first = false;

sql += QString( fld.typeName() == "geometry" ? "%1=geomfromewkt(%2)" :
sql += QString( fld.typeName() == "geometry" ? "%1=st_geomfromewkt(%2)" :
fld.typeName() == "geography" ? "%1=st_geographyfromewkt(%2)" :
"%1=%2" )
.arg( quotedIdentifier( fld.name() ) )
Expand Down Expand Up @@ -2695,7 +2695,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
// Start the PostGIS transaction
connectionRW->PQexecNR( "BEGIN" );

QString update = QString( "UPDATE %1 SET %2=GeomFromWKB($1%3,%4) WHERE %5=$2" )
QString update = QString( "UPDATE %1 SET %2=st_geomfromwkb($1%3,%4) WHERE %5=$2" )
.arg( mQuery )
.arg( quotedIdentifier( geometryColumn ) )
.arg( connectionRW->useWkbHex() ? "" : "::bytea" )
Expand Down Expand Up @@ -2879,7 +2879,7 @@ QgsRectangle QgsPostgresProvider::extent()
{
if ( QString::fromUtf8( PQgetvalue( result, 0, 0 ) ).toInt() > 0 )
{
sql = QString( "select estimated_extent(%1,%2,%3)" )
sql = QString( "select st_estimated_extent(%1,%2,%3)" )
.arg( quotedValue( mSchemaName ) )
.arg( quotedValue( mTableName ) )
.arg( quotedValue( geometryColumn ) );
Expand Down Expand Up @@ -2907,7 +2907,7 @@ QgsRectangle QgsPostgresProvider::extent()

if ( ext.isEmpty() )
{
sql = QString( "select extent(%1) from %2" )
sql = QString( "select st_extent(%1) from %2" )
.arg( quotedIdentifier( geometryColumn ) )
.arg( mQuery );

Expand Down Expand Up @@ -3125,7 +3125,7 @@ bool QgsPostgresProvider::getGeometryDetails()
// Didn't find what we need in the geometry_columns table, so
// get stuff from the relevant column instead. This may (will?)
// fail if there is no data in the relevant table.
sql = QString( "select srid(%1), geometrytype(%1) from %2" )
sql = QString( "select st_srid(%1),st_geometrytype(%1) from %2" )
.arg( quotedIdentifier( geometryColumn ) )
.arg( mQuery );

Expand Down Expand Up @@ -3154,9 +3154,9 @@ bool QgsPostgresProvider::getGeometryDetails()
// check to see if there is a unique geometry type
sql = QString( "select distinct "
"case"
" when geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" when st_geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
" when st_geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
" when st_geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
" end "
"from " ).arg( quotedIdentifier( geometryColumn ) );
if ( mUseEstimatedMetadata )
Expand Down

0 comments on commit 21c2461

Please sign in to comment.