Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #35350 from m-kuhn/fix_provided_column_type_pg
Fix provided column type pg
  • Loading branch information
m-kuhn committed Mar 26, 2020
2 parents f282a04 + 38c0d63 commit 8b965e3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
20 changes: 20 additions & 0 deletions src/providers/postgres/qgspostgresconn.cpp
Expand Up @@ -2023,6 +2023,26 @@ void QgsPostgresConn::postgisWkbType( QgsWkbTypes::Type wkbType, QString &geomet
geometryType = QStringLiteral( "MULTIPOLYGON" );
break;

case QgsWkbTypes::CircularString:
geometryType = QStringLiteral( "CIRCULARSTRING" );
break;

case QgsWkbTypes::CompoundCurve:
geometryType = QStringLiteral( "COMPOUNDCURVE" );
break;

case QgsWkbTypes::CurvePolygon:
geometryType = QStringLiteral( "CURVEPOLYGON" );
break;

case QgsWkbTypes::MultiCurve:
geometryType = QStringLiteral( "MULTICURVE" );
break;

case QgsWkbTypes::MultiSurface:
geometryType = QStringLiteral( "MULTISURFACE" );
break;

case QgsWkbTypes::Unknown:
geometryType = QStringLiteral( "GEOMETRY" );
break;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.cpp
Expand Up @@ -3669,7 +3669,7 @@ bool QgsPostgresProvider::getGeometryDetails()
detectedType += QLatin1String( "ZM" );

QString ds = result.PQgetvalue( 0, 1 );
if ( ds != "0" ) detectedSrid = ds;
if ( ds != QLatin1String( "0" ) ) detectedSrid = ds;
mSpatialColType = SctGeometry;
}
else
Expand Down

0 comments on commit 8b965e3

Please sign in to comment.