1 files changed, 23 insertions, 28 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
index 826c6fc..5b24720 100644
--- a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Data.PGSQL
             : base(connectionString)
         {
             m_Realm = realm;
-            
+
             m_ConnectionString = connectionString;
 
             if (storeName != String.Empty)
@@ -104,7 +104,7 @@ namespace OpenSim.Data.PGSQL
             m_FieldTypes = new Dictionary<string, string>();
 
             string query = string.Format(@"select column_name,data_type
-                        from INFORMATION_SCHEMA.COLUMNS 
+                        from INFORMATION_SCHEMA.COLUMNS
                        where table_name = lower('{0}');
 
                 ", m_Realm);
@@ -145,27 +145,22 @@ namespace OpenSim.Data.PGSQL
         private List<string> GetConstraints()
         {
             List<string> constraints = new List<string>();
-            string query = string.Format(@"SELECT kcu.column_name
-                        FROM information_schema.table_constraints tc
-                        LEFT JOIN information_schema.key_column_usage kcu
-                        ON tc.constraint_catalog = kcu.constraint_catalog
-                        AND tc.constraint_schema = kcu.constraint_schema
-                        AND tc.constraint_name = kcu.constraint_name
-
-                        LEFT JOIN information_schema.referential_constraints rc
-                        ON tc.constraint_catalog = rc.constraint_catalog
-                        AND tc.constraint_schema = rc.constraint_schema
-                        AND tc.constraint_name = rc.constraint_name
-
-                        LEFT JOIN information_schema.constraint_column_usage ccu
-                        ON rc.unique_constraint_catalog = ccu.constraint_catalog
-                        AND rc.unique_constraint_schema = ccu.constraint_schema
-                        AND rc.unique_constraint_name = ccu.constraint_name
-
-                        where tc.table_name = lower('{0}') 
-                        and lower(tc.constraint_type) in ('primary key')
-                        and kcu.column_name is not null
-                        ;", m_Realm);
+            string query = string.Format(@"select
+                    a.attname as column_name
+                from
+                    pg_class t,
+                    pg_class i,
+                    pg_index ix,
+                    pg_attribute a
+                where
+                    t.oid = ix.indrelid
+                    and i.oid = ix.indexrelid
+                    and a.attrelid = t.oid
+                    and a.attnum = ANY(ix.indkey)
+                    and t.relkind = 'r'
+                    and ix.indisunique = true
+                    and t.relname = lower('{0}')
+            ;", m_Realm);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
@@ -237,7 +232,7 @@ namespace OpenSim.Data.PGSQL
                 if (reader == null)
                     return new T[0];
 
-                CheckColumnNames(reader);                
+                CheckColumnNames(reader);
 
                 while (reader.Read())
                 {
@@ -344,7 +339,7 @@ namespace OpenSim.Data.PGSQL
                     names.Add(fi.Name);
                     values.Add(":" + fi.Name);
                     // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the
                     // InventoryTransferModule or we may be required to substitute a DBNull here.
                     if (fi.GetValue(row) == null)
                         throw new NullReferenceException(
@@ -400,11 +395,11 @@ namespace OpenSim.Data.PGSQL
                     }
                     string where = String.Join(" AND ", terms.ToArray());
                     query.AppendFormat(" WHERE {0} ", where);
-                    
+
                 }
                 cmd.Connection = conn;
                 cmd.CommandText = query.ToString();
-                
+
                 conn.Open();
                 if (cmd.ExecuteNonQuery() > 0)
                 {
@@ -421,7 +416,7 @@ namespace OpenSim.Data.PGSQL
                     query.Append("\") values (" + String.Join(",", values.ToArray()) + ")");
                     cmd.Connection = conn;
                     cmd.CommandText = query.ToString();
-                    
+
                     // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText);
 
                     if (conn.State != ConnectionState.Open)