sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use 'limit 0' when gathering metadata, also we don't need getFieldSize at all

Browse source
This commit is contained in:
Artem Pavlenko 2007-09-07 15:50:40 +00:00
parent ef6f1060d3
commit 92b22558fd
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
plugins/input/postgis/postgis.cpp
View file

@ -99,37 +99,32 @@ postgis_datasource::postgis_datasource(parameters const& params)
// collect attribute desc
s.str("");
s << "select * from " << table_ << " limit 1";
s << "select * from " << table_ << " limit 0";
rs=conn->executeQuery(s.str());
if (rs->next())
int count = rs->getNumFields();
for (int i=0;i<count;++i)
{
int count = rs->getNumFields();
for (int i=0;i<count;++i)
std::string fld_name=rs->getFieldName(i);
int type_oid = rs->getTypeOID(i);
switch (type_oid)
{
std::string fld_name=rs->getFieldName(i);
int length = rs->getFieldLength(i);
int type_oid = rs->getTypeOID(i);
switch (type_oid)
{
case 21: // int2
case 23: // int4
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Integer,false,length));
break;
case 700: // float4
case 701: // float8
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double,false,length));
case 1042: // bpchar
case 1043: // varchar
case 25: // text
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::String));
break;
default: // shouldn't get here
case 21: // int2
case 23: // int4
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Integer));
break;
case 700: // float4
case 701: // float8
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
case 1042: // bpchar
case 1043: // varchar
case 25: // text
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::String));
break;
default: // shouldn't get here
#ifdef MAPNIK_DEBUG
clog << "unknown type_oid="<<type_oid<<endl;
clog << "unknown type_oid="<<type_oid<<endl;
#endif
break;
}
break;
}
}
}