Changeset 14204

Timestamp:

04/05/08 12:00:20 (5 months ago)

Author:

rouault

Message:

Add the ability to specify a list of tables to be treated as layers with the 'tables=' connection string option (#1699)

Files:

• trunk/gdal/ogr/ogrsf_frmts/pg/drv_pg.html (modified) (7 diffs)
• trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp (modified) (3 diffs)

trunk/gdal/ogr/ogrsf_frmts/pg/drv_pg.html

@@ -19 +19 @@
-that would apply to it, apply to the name here.  The PG: prefix is used
-to mark the name as a postgres connection string.<p>
+
+The set of tables to be scanned can be overridden by specifying
+<i>tables=[schema.]table[,[schema2.]table2,...]</i> within the connection string.
+If the parameter is found, the driver skips enumeration of the tables as
+described in the next paragraph.<p>
-
-If the <i>geometry_columns</i> table exists, then all listed tables and
@@ -129 +134 @@
-<h3>Example</h3>
-
+<ul>
+<li>
-Simple translation of a shapefile into PostgreSQL.  The table 'abc' will
-be created with the features from abc.shp and attributes from abc.dbf. 
@@ -138 +145 @@
-</pre>
-
+<li>
-<p>
-This second example loads a political boundaries layer from VPF (via the
@@ -149 +157 @@
-        -lco OVERWRITE=yes -nln polbndl_bnd 'polbndl@bnd(*)_line'
-</pre>
-
+
+
+
-<p>
-In this example we merge tiger line data from two different directories of
@@ -161 +171 @@
-     CompleteChain
-</pre>
-
+
+
+
-<p>
-This example shows using ogrinfo to evaluate an SQL query statement 
@@ -170 +182 @@
-ogrinfo -ro PG:dbname=warmerda -sql "SELECT pop_1994 from canada where province_name = 'Alberta'"
-</pre>
-
+
+
+
-<p>
-This example shows using ogrinfo to list PostgreSQL/PostGIS layers on a different host.<p>
@@ -177 +191 @@
-ogrinfo -ro PG:'host=myserver.velocet.ca user=postgres dbname=warmerda'
-</pre>
+</li>
+
+<li>
+<p>
+This example shows using ogrinfo to list only the layers specified by the <i>tables=</i> options.<p>
+
+<pre>
+ogrinfo -ro PG:'dbname=warmerda tables=table1,table2'
+</pre>
+</li>
+
+</ul>
-
-<h3>See Also</h3>

trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp

@@ -182 +182 @@
-    }
-
+    pszName = CPLStrdup( pszNewName );
+
+/* -------------------------------------------------------------------- */
+/*      Determine if the connection string contains an optional         */
+/*      TABLES portion. If so, parse it out. The expected               */
+/*      connection string in this case will be, e.g.:                   */
+/*                                                                      */
+/*        'PG:dbname=warmerda user=warmerda tables=s1.t1,[s2.t2,...]    */
+/*              - where sN is schema and tN is table name               */
+/*      We must also strip this information from the connection         */
+/*      string; PQconnectdb() does not like unknown directives          */
+/* -------------------------------------------------------------------- */
+    char              **papszTableNames=NULL;
+    char              **papszSchemaNames=NULL;
+
+    char             *pszTableStart;
+    pszTableStart = strstr(pszName, "tables=");
+    if (pszTableStart == NULL)
+        pszTableStart = strstr(pszName, "TABLES=");
+
+    if( pszTableStart != NULL )
+    {
+        char          **papszTableList;
+        char           *pszTableSpec;
+        const char     *pszEnd = NULL;
+        int             i;
+
+        pszTableSpec = CPLStrdup( pszTableStart + 7 );
+
+        for( i = 0; pszTableStart[i] != '\0'; i++ )
+        {
+            if( pszTableStart[i] == ' ' )
+            {
+                pszEnd = pszTableStart + i;
+                break;
+            }
+        }
+
+        if( pszEnd == NULL )
+            pszEnd = pszName + strlen(pszName);
+
+        // Remove TABLES=xxxxx from pszName string
+        memmove( pszTableStart, pszEnd, strlen(pszEnd) + 1 );
+
+        pszTableSpec[pszEnd - pszTableStart - 7] = '\0';
+        papszTableList = CSLTokenizeString2( pszTableSpec, ",", 0 );
+
+        for( i = 0; i < CSLCount(papszTableList); i++ )
+        {
+            char      **papszQualifiedParts;
+
+            // Get schema and table name
+            papszQualifiedParts = CSLTokenizeString2( papszTableList[i],
+                                                      ".", 0 );
+
+            if( CSLCount( papszQualifiedParts ) == 2 )
+            {
+                papszSchemaNames = CSLAddString( papszSchemaNames, 
+                                                papszQualifiedParts[0] );
+                papszTableNames = CSLAddString( papszTableNames,
+                                                papszQualifiedParts[1] );
+            }
+            else if( CSLCount( papszQualifiedParts ) == 1 )
+            {
+                papszSchemaNames = CSLAddString( papszSchemaNames, "public");
+                papszTableNames = CSLAddString( papszTableNames,
+                                                papszQualifiedParts[0] );
+            }
+
+            CSLDestroy(papszQualifiedParts);
+        }
+
+        CSLDestroy(papszTableList);
+        CPLFree(pszTableSpec);
+    }
+
-/* -------------------------------------------------------------------- */
-/*      Try to establish connection.                                    */
-/* -------------------------------------------------------------------- */
-ewN
+
-    if( hPGConn == NULL || PQstatus(hPGConn) == CONNECTION_BAD )
-    {
+        CPLFree(pszName);
+        pszName = NULL;
+
-        CPLError( CE_Failure, CPLE_AppDefined,
-                  "PQconnectdb failed.\n%s",
@@ -195 +274 @@
-        return FALSE;
-    }
-
-    pszName = CPLStrdup( pszNewName );
-
-    bDSUpdate = bUpdate;
@@ -404 +481 @@
-
-/* -------------------------------------------------------------------- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* -------------------------------------------------------------------- */
-/*      Register the available tables.                                  */
-/* -------------------------------------------------------------------- */
-
+nt i
-         papszTableNames != NULL && papszTableNames[iRecord] != NULL;
-         iRecord++ )