0025855: Problem on Building runtime model when the tablename starts with pg

diff --git a/src/org/openbravo/base/session/SessionFactoryController.java b/src/org/openbravo/base/session/SessionFactoryController.java
--- a/src/org/openbravo/base/session/SessionFactoryController.java
+++ b/src/org/openbravo/base/session/SessionFactoryController.java
@@ -45,9 +45,10 @@
   private static final String UNIQUE_CONSTRAINT_QUERY_POSTGRES = "SELECT pg_class.relname, pg_attribute.attname, pg_constraint.conname FROM pg_constraint JOIN pg_class ON pg_class.oid = pg_constraint.conrelid JOIN pg_attribute ON pg_attribute.attrelid=pg_constraint.conrelid WHERE pg_constraint.contype = 'u' AND (pg_attribute.attnum = ANY (pg_constraint.conkey)) order by pg_constraint.conname";
   private static final String UNIQUE_CONSTRAINT_QUERY_ORACLE = "SELECT UCC.TABLE_NAME,UCC.COLUMN_NAME,UCC.CONSTRAINT_NAME FROM USER_CONS_COLUMNS UCC JOIN USER_CONSTRAINTS UC ON UC.CONSTRAINT_NAME=UCC.CONSTRAINT_NAME WHERE UC.CONSTRAINT_TYPE = 'U' ORDER BY UCC.CONSTRAINT_NAME";
 
-  private static final String COLUMN_QUERY_POSTGRES = "SELECT t.tablename, a.attname, a.attnotnull FROM pg_tables t, pg_class c, pg_attribute a "
-      + "WHERE tablename NOT LIKE 'pg%' AND tablename NOT LIKE 'sql%' and "
-      + "c.relname = t.tablename AND a.attnum > 0 AND a.attrelid = c.oid";
+  private static final String COLUMN_QUERY_POSTGRES = "SELECT t.tablename, a.attname, a.attnotnull FROM pg_tables t, pg_class c, pg_attribute a , pg_namespace n "
+      + "WHERE tablename NOT LIKE 'sql%' and "
+      + "c.relname = t.tablename AND a.attnum > 0 AND a.attrelid = c.oid and "
+      + "c.relnamespace = n.oid AND n.nspname = \"current_schema\"()";
 
   private static final String COLUMN_QUERY_ORACLE = "SELECT C.TABLE_NAME, C.COLUMN_NAME, C.NULLABLE "
       + "FROM USER_TAB_COLUMNS C  ORDER BY C.TABLE_NAME";