← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/grass/intrepid

« back to all changes in this revision

Viewing changes to db/drivers/postgres/describe.c

  • Committer: Bazaar Package Importer
  • Author(s): Noèl Köthe
  • Date: 2008-04-06 17:08:21 UTC
  • mfrom: (1.1.5 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080406170821-7l3d3ulh4g8crwcs
Tags: 6.2.3-2.1
http://bugs.debian.org/461673
* NMU during credativ BSP 2008
* using patch from Moritz Muehlenhoff <jmm@inutil.org> to fix
  FTBFS with GCC 4.3: missing #includes
  (closes: #461673)

Show diffs side-by-side

added added

removed removed

Lines of Context:
db/drivers/postgres/describe.c
97
97
 
98
98
        /* PG types defined in globals.h (and pg_type.h) */
99
99
        if ( sqltype == DB_SQL_TYPE_UNKNOWN ) {
100
 
            /* Warn, ignore and continue */
101
 
            G_warning ( _("pg driver: column '%s', type %d  is not supported"), fname, pgtype);
102
 
            continue;
 
100
            if (gpgtype == PG_TYPE_POSTGIS_GEOM) {
 
101
                G_warning ( _("pg driver: PostGIS column '%s', type 'geometry'  will not be converted"), fname);
 
102
                continue;
 
103
            } else {
 
104
                /* Warn, ignore and continue */
 
105
                G_warning ( _("pg driver: column '%s', type %d  is not supported"), fname, pgtype);
 
106
                continue;
 
107
            }
103
108
        }
104
109
 
105
110
        if ( gpgtype == PG_TYPE_INT8 )