Changeset 773

Timestamp:

11/21/08 08:21:41 (7 weeks ago)

Author:

artem

Message:

+ applied postgis_schema patch from dodobas

Files:

• trunk/plugins/input/postgis/postgis.cpp (modified) (1 diff)

trunk/plugins/input/postgis/postgis.cpp

@@ -123 +123 @@
          
          std::string table_name=table_from_sql(table_);
+         std::string schema_name="";
+         std::string::size_type idx=table_name.find_last_of('.');
+         if (idx!=std::string::npos)
+         {
+            schema_name=table_name.substr(0,idx);
+            table_name=table_name.substr(idx+1);
+         }
+         else
+         {
+            table_name=table_name.substr(0);
+         }
+
          std::ostringstream s;
          s << "select f_geometry_column,srid,type from ";
          s << GEOMETRY_COLUMNS <<" where f_table_name='" << table_name<<"'";
+         
+                 if (schema_name.length() > 0)
+                        s <<" and f_table_schema='"<< schema_name <<"'";
+
          if (geometry_field_.length() > 0)
             s << " and f_geometry_column = '" << geometry_field_ << "'";