X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fpq%2FGateway%2FTable%2FRelations.php;h=b96ae661a8b12bd1a256d4775535163c0a25dfed;hb=HEAD;hp=7ad5326a84931c84f7fe1c8e40bcc747ad48c913;hpb=3c8b32baaac62855e2c9f5bfdb5ede9685ce2b76;p=m6w6%2Fpq-gateway

diff --git a/lib/pq/Gateway/Table/Relations.php b/lib/pq/Gateway/Table/Relations.php
index 7ad5326..b96ae66 100644
--- a/lib/pq/Gateway/Table/Relations.php
+++ b/lib/pq/Gateway/Table/Relations.php
@@ -6,66 +6,119 @@ 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"
-from
-     pg_constraint co
-    ,pg_class      cl1
-    ,pg_class      cl2
-    ,pg_attribute  att1
-    ,pg_attribute  att2
+	 cl1.relname  as "foreignTable"
+	,array(
+		select 
+			 attname
+			from pg_attribute,
+			generate_subscripts(conkey,1) index
+		where 
+			attrelid = cl1.oid 
+		and attnum   = any(conkey) 
+		and conkey[index] = attnum
+		order by
+			 index
+	)             as "foreignColumns"
+	,cl2.relname  as "referencedTable"
+	,array(
+		select 
+			 attname
+			from pg_attribute,
+			generate_subscripts(confkey,1) index
+		where 
+			attrelid = cl2.oid 
+		and attnum   = any(confkey) 
+		and confkey[index] = attnum
+		order by
+			 index
+	)             as "referencedColumns"
+from pg_constraint co
+join pg_class      cl1 on cl1.oid = co.conrelid
+join pg_class      cl2 on cl2.oid = co.confrelid
 where
-	(	cl1.relname = \$1
-	or	cl2.relname = \$1)
+	 cl1.relname  = \$1
+and co.contype    = 'f'
 and co.confrelid != 0
-and co.conrelid   = cl1.oid
-and co.conkey[1]  = att1.attnum and cl1.oid = att1.attrelid
-and co.confrelid  = cl2.oid
-and co.confkey[1] = att2.attnum and cl2.oid = att2.attrelid
-order by 
-	 cl1.relname
-	,att1.attnum
 SQL;
 
 /**
- * A foreighn key implementation
+ * Foreign key list
  */
-class Relations
+class Relations implements \Countable, \IteratorAggregate
 {
 	/**
 	 * @var array
 	 */
 	protected $references;
 	
+	/**
+	 * @param \pq\Gateway\Table $table
+	 */
 	function __construct(Table $table) {
 		$cache = $table->getMetadataCache();
-		if (!($this->references = $cache->get("$table#relations"))) {
+		if (!($this->references = $cache->get("$table:relations"))) {
 			$table->getQueryExecutor()->execute(
 				new \pq\Query\Writer(RELATION_SQL, array($table->getName())),
 				function($result) use($table, $cache) {
-					$this->references = $result->map(array(0,1), array(1,2,3,4), \pq\Result::FETCH_OBJECT);
-					$cache->set("$table#relations", $this->references);
+					$rel = $result->map([1,2], null, \pq\Result::FETCH_ASSOC);
+					foreach ($rel as $ref) {
+						foreach ($ref as $table => $key) {
+							$reference = new Reference($key);
+							$this->references[$table][$reference->name] = $reference;
+						}
+					}
+					$cache->set("$table:relations", $this->references);
 				}
 			);
 		}
 	}
 	
 	function __isset($r) {
-		return isset($this->references->$r);
+		return isset($this->references[$r]);
 	}
 	
 	function __get($r) {
-		return $this->references->$r;
+		return $this->references[$r];
 	}
 	
 	function __set($r, $v) {
-		$this->references->$r = $v;
+		$this->references[$r] = $v;
 	}
 	
 	function __unset($r){
-		unset($this->references->$r);
+		unset($this->references[$r]);
+	}
+	
+	/**
+	 * Get a reference to a table
+	 * @param string $table
+	 * @param string $ref
+	 * @return \pq\Gateway\Table\Reference
+	 */
+	function getReference($table, $ref = null) {
+		if (isset($this->references[$table])) {
+			if (!strlen($ref)) {
+				return current($this->references[$table]);
+			}
+			if (isset($this->references[$table][$ref])) {
+				return $this->references[$table][$ref];
+			}
+		}
+	}
+	
+	/**
+	 * Implements \Countable
+	 * @return int
+	 */
+	function count() {
+		return array_sum(array_map("count", $this->references));
+	}
+	
+	/**
+	 * Implements \IteratorAggregate
+	 * @return \ArrayIterator
+	 */
+	function getIterator() {
+		return new \ArrayIterator($this->references);
 	}
 }