Merge "rdbms: Remove references to pg_attrdef.adsrc in Postgres code" into REL1_31
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Nov 2019 18:49:48 +0000 (18:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Nov 2019 18:49:48 +0000 (18:49 +0000)
1  2 
includes/libs/rdbms/database/DatabasePostgres.php

@@@ -119,7 -119,7 +119,7 @@@ class DatabasePostgres extends Databas
                        $connectVars['port'] = (int)$this->port;
                }
                if ( $this->flags & self::DBO_SSL ) {
 -                      $connectVars['sslmode'] = 1;
 +                      $connectVars['sslmode'] = 'require';
                }
  
                $this->connectString = $this->makeConnectionString( $connectVars );
@@@ -816,7 -816,7 +816,7 @@@ __INDEXATTR__
                        . ' WHERE relkind = \'r\''
                        . ' AND nspname = ' . $this->addQuotes( $this->getCoreSchema() )
                        . ' AND relname = ' . $this->addQuotes( $oldName )
-                       . ' AND adsrc LIKE \'nextval(%\'',
+                       . ' AND pg_get_expr(adbin, adrelid) LIKE \'nextval(%\'',
                        $fname
                );
                $row = $this->fetchObject( $res );
                        }
  
                        $oid = $this->fetchObject( $res )->oid;
-                       $res = $this->query( 'SELECT adsrc FROM pg_attribute a'
+                       $res = $this->query( 'SELECT pg_get_expr(adbin, adrelid) AS adsrc FROM pg_attribute a'
                                . ' JOIN pg_attrdef d ON (a.attrelid=d.adrelid and a.attnum=d.adnum)'
                                . " WHERE a.attrelid = $oid"
-                               . ' AND adsrc LIKE \'nextval(%\'',
+                               . ' AND pg_get_expr(adbin, adrelid) LIKE \'nextval(%\'',
                                $fname
                        );
                        $row = $this->fetchObject( $res );