PG raster: do not require db name

... in case a service file is used
qgis · Jan 14, 2020 · 99ac4fb · 99ac4fb
1 parent 483ed77
commit 99ac4fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/providers/postgres/raster/qgspostgresrasterprovider.cpp b/src/providers/postgres/raster/qgspostgresrasterprovider.cpp
@@ -42,10 +42,6 @@ QgsPostgresRasterProvider::QgsPostgresRasterProvider( const QString &uri, const
   mTableName = mUri.table();
 
   mRasterColumn = mUri.geometryColumn();
-  if ( mRasterColumn.isEmpty() )
-  {
-    mRasterColumn = QStringLiteral( "rast" );
-  }
   mSqlWhereClause = mUri.sql();
   mRequestedSrid = mUri.srid();
 
@@ -749,10 +745,9 @@ bool QgsPostgresRasterProvider::init()
                                           "out_db, spatial_index, scale_x, scale_y, same_alignment,"
                                           "regular_blocking "
                                           "FROM raster_columns WHERE "
-                                          "r_table_name = %1 AND r_table_schema = %2 AND r_table_catalog = %3" )
+                                          "r_table_name = %1 AND r_table_schema = %2" )
                           .arg( quotedValue( mTableName ) )
-                          .arg( quotedValue( mSchemaName ) )
-                          .arg( quotedValue( mUri.database() ) ) };
+                          .arg( quotedValue( mSchemaName ) )  };
 
       QgsPostgresResult result( connectionRO()->PQexec( sql ) );
 
@@ -1372,10 +1367,9 @@ QString QgsPostgresRasterProvider::pkSql()
 void QgsPostgresRasterProvider::findOverviews()
 {
   const QString sql { QStringLiteral( "SELECT overview_factor, o_table_schema, o_table_name, o_raster_column "
-                                      "FROM raster_overviews WHERE r_table_schema = %1 AND r_table_name = %2 AND r_table_catalog = %3" )
+                                      "FROM raster_overviews WHERE r_table_schema = %1 AND r_table_name = %2" )
                       .arg( quotedValue( mSchemaName ) )
-                      .arg( quotedValue( mTableName ) )
-                      .arg( quotedValue( mUri.database() ) ) };
+                      .arg( quotedValue( mTableName ) ) };
 
   //QgsDebugMsg( QStringLiteral( "Raster overview information sql: %1" ).arg( sql ) );
   QgsPostgresResult result( connectionRO()->PQexec( sql ) );

diff --git a/src/providers/postgres/raster/qgspostgresrasterprovider.h b/src/providers/postgres/raster/qgspostgresrasterprovider.h
@@ -145,6 +145,8 @@ class QgsPostgresRasterProvider : public QgsRasterDataProvider
     //! Mutable data shared between provider and feature sources
     std::shared_ptr<QgsPostgresRasterSharedData> mShared;
 
+    QString mDbName;
+
     // Methods
 
     QgsPostgresConn *connectionRO() const;

diff --git a/tests/testdata/provider/testdata_pg_raster.sql b/tests/testdata/provider/testdata_pg_raster.sql
@@ -93,7 +93,7 @@ INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1",
 INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C000000000F2204F4100000000768B424100000000000000000000000000000000DB0B0000020002004A003C1CC6132B3843AC824043F87A4843B5494A43'::raster,'cat1', 2, 2);
 INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C0000000000B214F4100000000768B424100000000000000000000000000000000DB0B0000020002004A003C1CC6E6CF48436E465A4349454E4374F35B43'::raster,'cat1', 2, 3);
 INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C000000000D9204F41000000005D8B424100000000000000000000000000000000DB0B0000020001004A003C1CC6906E41433AB54C43'::raster,'cat1', 3, 1);
-INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C000000000F2204F41000000005D8B424100000000000000000000000000000000DB0B0000020001004A003C1CC6B056504358575243'::raster,'cat1', 3, 1);
+INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C000000000F2204F41000000005D8B424100000000000000000000000000000000DB0B0000020001004A003C1CC6B056504358575243'::raster,'cat1', 3, 2);
 INSERT INTO "public"."raster_3035_tiled_composite_pk" ("rast","category", "pk1", "pk2") VALUES ('0100000100000000000000394000000000000039C0000000000B214F41000000005D8B424100000000000000000000000000000000DB0B0000020001004A003C1CC6B1EC574322615F43'::raster,'cat2', 3, 3);
 CREATE INDEX ON "public"."raster_3035_tiled_composite_pk" USING gist (st_convexhull("rast"));
 ANALYZE "public"."raster_3035_tiled_composite_pk";