Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1152862: Require PostgreSQL 9.0

Browse Source 
r/a=glob


git-svn-id: svn://10.0.0.236/trunk@265916 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2015-04-10 11:45:51 +00:00
parent e3988f620c
commit 6945ffb3f7
4 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9370 9371

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
8a1de002259e31702ba278778f4e0ed2026666af 647b7158953b7db7ebab61f54796669561470351

9
mozilla/webtools/bugzilla/Bugzilla/Constants.pm
View File

@ -527,15 +527,12 @@ use constant DB_MODULE => {
version => '4.001', version => '4.001',
}, },
name => 'MySQL'}, name => 'MySQL'},
# Also see Bugzilla::DB::Pg::bz_check_server_version, which has special 'pg' => {db => 'Bugzilla::DB::Pg', db_version => '9.00.0000',
# code to require DBD::Pg 2.17.2 for PostgreSQL 9 and above.
'pg' => {db => 'Bugzilla::DB::Pg', db_version => '8.03.0000',
dbd => { dbd => {
package => 'DBD-Pg', package => 'DBD-Pg',
module => 'DBD::Pg', module => 'DBD::Pg',
# 2.7.0 fixes a problem with quoting strings # Pg 9.2 requires 2.19.3 as spclocation no longer exists.
# containing backslashes in them. version => '2.19.3',
version => '2.7.0',
}, },
name => 'PostgreSQL'}, name => 'PostgreSQL'},
'oracle'=> {db => 'Bugzilla::DB::Oracle', db_version => '10.02.0', 'oracle'=> {db => 'Bugzilla::DB::Oracle', db_version => '10.02.0',

21
mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm
View File

@ -102,11 +102,6 @@ sub sql_group_concat {
$order_by = " ORDER BY $1"; $order_by = " ORDER BY $1";
} }
if (vers_cmp($self->bz_server_version, 9) < 0) {
# PostgreSQL 8.x doesn't support STRING_AGG
return "ARRAY_TO_STRING(ARRAY_AGG($text$order_by), $separator)";
}
return "STRING_AGG(${text}::text, $separator${order_by}::text)" return "STRING_AGG(${text}::text, $separator${order_by}::text)"
} }
@ -212,20 +207,6 @@ sub bz_explain {
# Custom Database Setup # Custom Database Setup
##################################################################### #####################################################################
sub bz_check_server_version {
my $self = shift;
my ($db) = @_;
my $server_version = $self->SUPER::bz_check_server_version(@_);
my ($major_version, $minor_version) = $server_version =~ /^0*(\d+)\.0*(\d+)/;
# Pg 9.0 requires DBD::Pg 2.17.2 in order to properly read bytea values.
# Pg 9.2 requires DBD::Pg 2.19.3 as spclocation no longer exists.
if ($major_version >= 9) {
local $db->{dbd}->{version} = ($minor_version >= 2) ? '2.19.3' : '2.17.2';
local $db->{name} = $db->{name} . " ${major_version}.$minor_version";
Bugzilla::DB::_bz_check_dbd(@_);
}
}
sub bz_setup_database { sub bz_setup_database {
my $self = shift; my $self = shift;
$self->SUPER::bz_setup_database(@_); $self->SUPER::bz_setup_database(@_);
@ -436,8 +417,6 @@ sub bz_table_list_real {
=item sql_to_days =item sql_to_days
=item bz_check_server_version
=item sql_from_days =item sql_from_days
=item bz_table_list_real =item bz_table_list_real