summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Bugzilla/DB/Schema.pm2
-rw-r--r--Bugzilla/Install/DB.pm3
-rw-r--r--Bugzilla/Product.pm10
-rw-r--r--Bugzilla/Version.pm76
-rwxr-xr-ximportxml.pl4
5 files changed, 47 insertions, 48 deletions
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 7aa77108e..98a455e7b 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -501,6 +501,8 @@ use constant ABSTRACT_SCHEMA => {
milestones => {
FIELDS => [
+ id => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
+ PRIMARYKEY => 1},
product_id => {TYPE => 'INT2', NOTNULL => 1},
value => {TYPE => 'varchar(20)', NOTNULL => 1},
sortkey => {TYPE => 'INT2', NOTNULL => 1,
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 5c3c1485a..d78db3f5d 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -514,6 +514,9 @@ sub update_table_definitions {
{TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'});
$dbh->bz_add_column('longdescs', 'extra_data', {TYPE => 'varchar(255)'});
+ $dbh->bz_add_column('versions', 'id',
+ {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+
################################################################
# New --TABLE-- changes should go *** A B O V E *** this point #
################################################################
diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm
index 465d12515..c525efc11 100644
--- a/Bugzilla/Product.pm
+++ b/Bugzilla/Product.pm
@@ -106,15 +106,11 @@ sub versions {
my $dbh = Bugzilla->dbh;
if (!defined $self->{versions}) {
- my $values = $dbh->selectcol_arrayref(q{
- SELECT value FROM versions
+ my $ids = $dbh->selectcol_arrayref(q{
+ SELECT id FROM versions
WHERE product_id = ?}, undef, $self->id);
- my @versions;
- foreach my $value (sort { vers_cmp (lc($a), lc($b)) } @$values) {
- push @versions, new Bugzilla::Version($self->id, $value);
- }
- $self->{versions} = \@versions;
+ $self->{versions} = Bugzilla::Version->new_from_list($ids);
}
return $self->{versions};
}
diff --git a/Bugzilla/Version.pm b/Bugzilla/Version.pm
index 4d47ecdeb..f48de9089 100644
--- a/Bugzilla/Version.pm
+++ b/Bugzilla/Version.pm
@@ -13,11 +13,14 @@
# The Original Code is the Bugzilla Bug Tracking System.
#
# Contributor(s): Tiago R. Mello <timello@async.com.br>
+# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
package Bugzilla::Version;
+use base qw(Bugzilla::Object);
+
use Bugzilla::Util;
use Bugzilla::Error;
@@ -27,49 +30,44 @@ use Bugzilla::Error;
use constant DEFAULT_VERSION => 'unspecified';
+use constant DB_TABLE => 'versions';
+
use constant DB_COLUMNS => qw(
- versions.value
- versions.product_id
+ id
+ value
+ product_id
);
-our $columns = join(", ", DB_COLUMNS);
+use constant NAME_FIELD => 'value';
+use constant LIST_ORDER => NAME_FIELD;
sub new {
- my $invocant = shift;
- my $class = ref($invocant) || $invocant;
- my $self = {};
- bless($self, $class);
- return $self->_init(@_);
-}
-
-sub _init {
- my $self = shift;
- my ($product_id, $value) = (@_);
+ my $class = shift;
+ my $param = shift;
my $dbh = Bugzilla->dbh;
- my $version;
-
- if (defined $product_id
- && detaint_natural($product_id)
- && defined $value) {
-
- trick_taint($value);
- $version = $dbh->selectrow_hashref(qq{
- SELECT $columns FROM versions
- WHERE value = ?
- AND product_id = ?}, undef, ($value, $product_id));
- } else {
- ThrowCodeError('bad_arg',
- {argument => 'product_id/value',
- function => 'Bugzilla::Version::_init'});
+ my $product;
+ if (ref $param) {
+ $product = $param->{product};
+ my $name = $param->{name};
+ if (!defined $product) {
+ ThrowCodeError('bad_arg',
+ {argument => 'product',
+ function => "${class}::new"});
+ }
+ if (!defined $name) {
+ ThrowCodeError('bad_arg',
+ {argument => 'name',
+ function => "${class}::new"});
+ }
+
+ my $condition = 'product_id = ? AND value = ?';
+ my @values = ($product->id, $name);
+ $param = { condition => $condition, values => \@values };
}
- return undef unless (defined $version);
-
- foreach my $field (keys %$version) {
- $self->{$field} = $version->{$field};
- }
- return $self;
+ unshift @_, $param;
+ return $class->SUPER::new(@_);
}
sub bug_count {
@@ -110,7 +108,7 @@ sub update {
$name = clean_text($name);
return 0 if ($name eq $self->name);
- my $version = new Bugzilla::Version($self->product_id, $name);
+ my $version = new Bugzilla::Version({ product => $product, name => $name });
if ($version) {
ThrowUserError('version_already_exists',
@@ -147,7 +145,8 @@ sub check_version {
my ($product, $version_name) = @_;
$version_name || ThrowUserError('version_not_specified');
- my $version = new Bugzilla::Version($product->id, $version_name);
+ my $version = new Bugzilla::Version(
+ { product => $product, name => $version_name });
unless ($version) {
ThrowUserError('version_not_valid',
{'product' => $product->name,
@@ -166,7 +165,7 @@ sub create {
# Remove unprintable characters
$name = clean_text($name);
- my $version = new Bugzilla::Version($product->id, $name);
+ my $version = new Bugzilla::Version({ product => $product, name => $name });
if ($version) {
ThrowUserError('version_already_exists',
{'name' => $version->name,
@@ -178,8 +177,7 @@ sub create {
$dbh->do(q{INSERT INTO versions (value, product_id)
VALUES (?, ?)}, undef, ($name, $product->id));
- $version = new Bugzilla::Version($product->id, $name);
- return $version;
+ return new Bugzilla::Version($dbh->bz_last_key('versions', 'id'));
}
1;
diff --git a/importxml.pl b/importxml.pl
index 989eb31e0..5b14fc655 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -671,8 +671,8 @@ sub process_bug {
# Since there is no default version for a product, we check that the one
# coming over is valid. If not we will use the first one in @versions
# and warn them.
- my $version =
- new Bugzilla::Version( $product->id, $bug_fields{'version'} );
+ my $version = new Bugzilla::Version(
+ { product => $product, name => $bug_fields{'version'} });
push( @query, "version" );
if ($version) {
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-04-29 10:58:34 +0200