From: Michael Wallner <mike@php.net>
Date: Wed, 11 Dec 2013 21:28:01 +0000 (+0100)
Subject: sanitize id computation
X-Git-Tag: v2.0.0~13
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f58579139c1bf358eca1982628c63a5d609dfada;p=m6w6%2Fpq-gateway

sanitize id computation
---

diff --git a/lib/pq/Gateway/Table/Relations.php b/lib/pq/Gateway/Table/Relations.php
index 7ad5326..3e4d7fb 100644
--- a/lib/pq/Gateway/Table/Relations.php
+++ b/lib/pq/Gateway/Table/Relations.php
@@ -6,11 +6,15 @@ use \pq\Gateway\Table;
 
 const RELATION_SQL = <<<SQL
 select
-	 substring(att1.attname from '^.*(?=_'||att2.attname||'$)') as "id"
-	,cl1.relname                                                as "foreignTable"
-    ,att1.attname                                               as "foreignColumn"
-	,cl2.relname                                                as "referencedTable"
-    ,att2.attname                                               as "referencedColumn"
+	 case att1.attname
+	 when att2.attname
+		then att1.attname
+		else substring(att1.attname from '^.*(?=_'||att2.attname||'$)')
+	 end          as "id"
+	,cl1.relname  as "foreignTable"
+	,att1.attname as "foreignColumn"
+	,cl2.relname  as "referencedTable"
+	,att2.attname as "referencedColumn"
 from
      pg_constraint co
     ,pg_class      cl1