Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"

[lhc/web/wiklou.git] / includes / libs / rdbms / field / PostgresField.php

diff --git a/includes/libs/rdbms/field/PostgresField.php b/includes/libs/rdbms/field/PostgresField.php
index c5819a3..53c3d33 100644 (file)
--- a/includes/libs/rdbms/field/PostgresField.php
+++ b/includes/libs/rdbms/field/PostgresField.php
@@ -2,8 +2,6 @@
 
 namespace Wikimedia\Rdbms;
 
-use DatabasePostgres;
-
 class PostgresField implements Field {
        private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname,
                $has_default, $default;
@@ -40,30 +38,34 @@ AND attname=%s;
 SQL;
 
                $table = $db->remappedTableName( $table );
-               $res = $db->query(
-                       sprintf( $q,
-                               $db->addQuotes( $db->getCoreSchema() ),
-                               $db->addQuotes( $table ),
-                               $db->addQuotes( $field )
-                       )
-               );
-               $row = $db->fetchObject( $res );
-               if ( !$row ) {
-                       return null;
+               foreach ( $db->getCoreSchemas() as $schema ) {
+                       $res = $db->query(
+                               sprintf( $q,
+                                       $db->addQuotes( $schema ),
+                                       $db->addQuotes( $table ),
+                                       $db->addQuotes( $field )
+                               )
+                       );
+                       $row = $db->fetchObject( $res );
+                       if ( !$row ) {
+                               continue;
+                       }
+                       $n = new PostgresField;
+                       $n->type = $row->typname;
+                       $n->nullable = ( $row->attnotnull == 'f' );
+                       $n->name = $field;
+                       $n->tablename = $table;
+                       $n->max_length = $row->attlen;
+                       $n->deferrable = ( $row->deferrable == 't' );
+                       $n->deferred = ( $row->deferred == 't' );
+                       $n->conname = $row->conname;
+                       $n->has_default = ( $row->atthasdef === 't' );
+                       $n->default = $row->adsrc;
+
+                       return $n;
                }
-               $n = new PostgresField;
-               $n->type = $row->typname;
-               $n->nullable = ( $row->attnotnull == 'f' );
-               $n->name = $field;
-               $n->tablename = $table;
-               $n->max_length = $row->attlen;
-               $n->deferrable = ( $row->deferrable == 't' );
-               $n->deferred = ( $row->deferred == 't' );
-               $n->conname = $row->conname;
-               $n->has_default = ( $row->atthasdef === 't' );
-               $n->default = $row->adsrc;
 
-               return $n;
+               return null;
        }
 
        function name() {