[Rt-commit] rt branch, 4.2/cf-searching, created. rt-4.1.6-146-g91cfc66
Alex Vandiver
alexmv at bestpractical.com
Tue Jan 29 15:53:33 EST 2013
The branch, 4.2/cf-searching has been created
at 91cfc66564a346f4b473a29fa66d5a332ed1c33c (commit)
- Log -----------------------------------------------------------------
commit fc7f84a03efda01d096d3aaf82d49c19a5c6a0ef
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:10:13 2013 -0500
Move custom field search code into RT::SearchBuilder
This merely moves two functions as-is, in preparation for refactoring
them to be useful on non-Ticket classes. As such, the code is placed in
_LimitCustomField, and the existing LimitCustomField implementation is
unchanged -- _LimitCustomField is still Ticket-specific.
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index c0aa94c..7514170 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -202,6 +202,105 @@ sub _SingularClass {
return $class;
}
+=head2 _CustomFieldJoin
+
+Factor out the Join of custom fields so we can use it for sorting too
+
+=cut
+
+sub _CustomFieldJoin {
+ my ($self, $cfkey, $cfid, $field) = @_;
+ # Perform one Join per CustomField
+ if ( $self->{_sql_object_cfv_alias}{$cfkey} ||
+ $self->{_sql_cf_alias}{$cfkey} )
+ {
+ return ( $self->{_sql_object_cfv_alias}{$cfkey},
+ $self->{_sql_cf_alias}{$cfkey} );
+ }
+
+ my ($TicketCFs, $CFs);
+ if ( $cfid ) {
+ $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
+ TYPE => 'LEFT',
+ ALIAS1 => 'main',
+ FIELD1 => 'id',
+ TABLE2 => 'ObjectCustomFieldValues',
+ FIELD2 => 'ObjectId',
+ );
+ $self->Limit(
+ LEFTJOIN => $TicketCFs,
+ FIELD => 'CustomField',
+ VALUE => $cfid,
+ ENTRYAGGREGATOR => 'AND'
+ );
+ }
+ else {
+ my $ocfalias = $self->Join(
+ TYPE => 'LEFT',
+ FIELD1 => 'Queue',
+ TABLE2 => 'ObjectCustomFields',
+ FIELD2 => 'ObjectId',
+ );
+
+ $self->Limit(
+ LEFTJOIN => $ocfalias,
+ ENTRYAGGREGATOR => 'OR',
+ FIELD => 'ObjectId',
+ VALUE => '0',
+ );
+
+ $CFs = $self->{_sql_cf_alias}{$cfkey} = $self->Join(
+ TYPE => 'LEFT',
+ ALIAS1 => $ocfalias,
+ FIELD1 => 'CustomField',
+ TABLE2 => 'CustomFields',
+ FIELD2 => 'id',
+ );
+ $self->Limit(
+ LEFTJOIN => $CFs,
+ ENTRYAGGREGATOR => 'AND',
+ FIELD => 'LookupType',
+ VALUE => 'RT::Queue-RT::Ticket',
+ );
+ $self->Limit(
+ LEFTJOIN => $CFs,
+ ENTRYAGGREGATOR => 'AND',
+ FIELD => 'Name',
+ VALUE => $field,
+ );
+
+ $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
+ TYPE => 'LEFT',
+ ALIAS1 => $CFs,
+ FIELD1 => 'id',
+ TABLE2 => 'ObjectCustomFieldValues',
+ FIELD2 => 'CustomField',
+ );
+ $self->Limit(
+ LEFTJOIN => $TicketCFs,
+ FIELD => 'ObjectId',
+ VALUE => 'main.id',
+ QUOTEVALUE => 0,
+ ENTRYAGGREGATOR => 'AND',
+ );
+ }
+ $self->Limit(
+ LEFTJOIN => $TicketCFs,
+ FIELD => 'ObjectType',
+ VALUE => 'RT::Ticket',
+ ENTRYAGGREGATOR => 'AND'
+ );
+ $self->Limit(
+ LEFTJOIN => $TicketCFs,
+ FIELD => 'Disabled',
+ OPERATOR => '=',
+ VALUE => '0',
+ ENTRYAGGREGATOR => 'AND'
+ );
+
+ return ($TicketCFs, $CFs);
+}
+
sub LimitCustomField {
my $self = shift;
my %args = ( VALUE => undef,
@@ -242,6 +341,373 @@ sub LimitCustomField {
);
}
+use Regexp::Common qw(RE_net_IPv4);
+use Regexp::Common::net::CIDR;
+
+sub _LimitCustomField {
+ my $self = shift;
+ my ( $field, $queue, $cfid, $cf, $column, $op, $value, %rest ) = @_;
+
+
+# If we're trying to find custom fields that don't match something, we
+# want tickets where the custom field has no value at all. Note that
+# we explicitly don't include the "IS NULL" case, since we would
+# otherwise end up with a redundant clause.
+
+ my $negative_op = ($op eq '!=' || $op =~ /\bNOT\b/i);
+ my $null_op = ( 'is not' eq lc($op) || 'is' eq lc($op) );
+
+ my $fix_op = sub {
+ return @_ unless RT->Config->Get('DatabaseType') eq 'Oracle';
+
+ my %args = @_;
+ return %args unless $args{'FIELD'} eq 'LargeContent';
+
+ my $op = $args{'OPERATOR'};
+ if ( $op eq '=' ) {
+ $args{'OPERATOR'} = 'MATCHES';
+ }
+ elsif ( $op eq '!=' ) {
+ $args{'OPERATOR'} = 'NOT MATCHES';
+ }
+ elsif ( $op =~ /^[<>]=?$/ ) {
+ $args{'FUNCTION'} = "TO_CHAR( $args{'ALIAS'}.LargeContent )";
+ }
+ return %args;
+ };
+
+ if ( $cf && $cf->Type eq 'IPAddress' ) {
+ my $parsed = RT::ObjectCustomFieldValue->ParseIP($value);
+ if ($parsed) {
+ $value = $parsed;
+ }
+ else {
+ $RT::Logger->warn("$value is not a valid IPAddress");
+ }
+ }
+
+ if ( $cf && $cf->Type eq 'IPAddressRange' ) {
+
+ if ( $value =~ /^\s*$RE{net}{CIDR}{IPv4}{-keep}\s*$/o ) {
+
+ # convert incomplete 192.168/24 to 192.168.0.0/24 format
+ $value =
+ join( '.', map $_ || 0, ( split /\./, $1 )[ 0 .. 3 ] ) . "/$2"
+ || $value;
+ }
+
+ my ( $start_ip, $end_ip ) =
+ RT::ObjectCustomFieldValue->ParseIPRange($value);
+ if ( $start_ip && $end_ip ) {
+ if ( $op =~ /^([<>])=?$/ ) {
+ my $is_less = $1 eq '<' ? 1 : 0;
+ if ( $is_less ) {
+ $value = $start_ip;
+ }
+ else {
+ $value = $end_ip;
+ }
+ }
+ else {
+ $value = join '-', $start_ip, $end_ip;
+ }
+ }
+ else {
+ $RT::Logger->warn("$value is not a valid IPAddressRange");
+ }
+ }
+
+ my $single_value = !$cf || !$cfid || $cf->SingleValue;
+
+ my $cfkey = $cfid ? $cfid : "$queue.$field";
+
+ if ( $null_op && !$column ) {
+ # IS[ NOT] NULL without column is the same as has[ no] any CF value,
+ # we can reuse our default joins for this operation
+ # with column specified we have different situation
+ my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ $self->_OpenParen;
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'id',
+ OPERATOR => $op,
+ VALUE => $value,
+ %rest
+ );
+ $self->Limit(
+ ALIAS => $CFs,
+ FIELD => 'Name',
+ OPERATOR => 'IS NOT',
+ VALUE => 'NULL',
+ QUOTEVALUE => 0,
+ ENTRYAGGREGATOR => 'AND',
+ ) if $CFs;
+ $self->_CloseParen;
+ }
+ elsif ( $op !~ /^[<>]=?$/ && ( $cf && $cf->Type eq 'IPAddressRange')) {
+
+ my ($start_ip, $end_ip) = split /-/, $value;
+
+ $self->_OpenParen;
+ if ( $op !~ /NOT|!=|<>/i ) { # positive equation
+ $self->_LimitCustomField(
+ $field, $queue, $cfid, $cf, 'Content', '<=', $end_ip, %rest,
+ );
+ $self->_LimitCustomField(
+ $field, $queue, $cfid, $cf, 'LargeContent', '>=', $start_ip, %rest,
+ ENTRYAGGREGATOR => 'AND',
+ );
+ # as well limit borders so DB optimizers can use better
+ # estimations and scan less rows
+# have to disable this tweak because of ipv6
+# $self->_CustomFieldLimit(
+# $field, '>=', '000.000.000.000', %rest,
+# SUBKEY => $rest{'SUBKEY'}. '.Content',
+# ENTRYAGGREGATOR => 'AND',
+# );
+# $self->_CustomFieldLimit(
+# $field, '<=', '255.255.255.255', %rest,
+# SUBKEY => $rest{'SUBKEY'}. '.LargeContent',
+# ENTRYAGGREGATOR => 'AND',
+# );
+ }
+ else { # negative equation
+ $self->_LimitCustomField( $field, $queue, $cfid, $cf, 'Content', '>', $end_ip, %rest);
+ $self->_LimitCustomField(
+ $field, $queue, $cfid, $cf, 'LargeContent', '<', $start_ip, %rest,
+ ENTRYAGGREGATOR => 'OR',
+ );
+ # TODO: as well limit borders so DB optimizers can use better
+ # estimations and scan less rows, but it's harder to do
+ # as we have OR aggregator
+ }
+ $self->_CloseParen;
+ }
+ elsif ( !$negative_op || $single_value ) {
+ $cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
+ my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+
+ $self->_OpenParen;
+
+ $self->_OpenParen;
+
+ $self->_OpenParen;
+ # if column is defined then deal only with it
+ # otherwise search in Content and in LargeContent
+ if ( $column ) {
+ $self->Limit( $fix_op->(
+ ALIAS => $TicketCFs,
+ FIELD => $column,
+ OPERATOR => $op,
+ VALUE => $value,
+ CASESENSITIVE => 0,
+ %rest
+ ) );
+ $self->_CloseParen;
+ $self->_CloseParen;
+ $self->_CloseParen;
+ }
+ else {
+ # need special treatment for Date
+ if ( $cf and $cf->Type eq 'DateTime' and $op eq '=' ) {
+
+ if ( $value =~ /:/ ) {
+ # there is time speccified.
+ my $date = RT::Date->new( $self->CurrentUser );
+ $date->Set( Format => 'unknown', Value => $value );
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => "=",
+ VALUE => $date->ISO,
+ %rest,
+ );
+ }
+ else {
+ # no time specified, that means we want everything on a
+ # particular day. in the database, we need to check for >
+ # and < the edges of that day.
+ my $date = RT::Date->new( $self->CurrentUser );
+ $date->Set( Format => 'unknown', Value => $value );
+ $date->SetToMidnight( Timezone => 'server' );
+ my $daystart = $date->ISO;
+ $date->AddDay;
+ my $dayend = $date->ISO;
+
+ $self->_OpenParen;
+
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => ">=",
+ VALUE => $daystart,
+ %rest,
+ );
+
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => "<=",
+ VALUE => $dayend,
+ %rest,
+ ENTRYAGGREGATOR => 'AND',
+ );
+
+ $self->_CloseParen;
+ }
+ }
+ elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
+ if ( length( Encode::encode_utf8($value) ) < 256 ) {
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => $op,
+ VALUE => $value,
+ CASESENSITIVE => 0,
+ %rest
+ );
+ }
+ else {
+ $self->_OpenParen;
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => '=',
+ VALUE => '',
+ ENTRYAGGREGATOR => 'OR'
+ );
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => 'IS',
+ VALUE => 'NULL',
+ ENTRYAGGREGATOR => 'OR'
+ );
+ $self->_CloseParen;
+ $self->Limit( $fix_op->(
+ ALIAS => $TicketCFs,
+ FIELD => 'LargeContent',
+ OPERATOR => $op,
+ VALUE => $value,
+ ENTRYAGGREGATOR => 'AND',
+ CASESENSITIVE => 0,
+ ) );
+ }
+ }
+ else {
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => $op,
+ VALUE => $value,
+ CASESENSITIVE => 0,
+ %rest
+ );
+
+ $self->_OpenParen;
+ $self->_OpenParen;
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => '=',
+ VALUE => '',
+ ENTRYAGGREGATOR => 'OR'
+ );
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => 'IS',
+ VALUE => 'NULL',
+ ENTRYAGGREGATOR => 'OR'
+ );
+ $self->_CloseParen;
+ $self->Limit( $fix_op->(
+ ALIAS => $TicketCFs,
+ FIELD => 'LargeContent',
+ OPERATOR => $op,
+ VALUE => $value,
+ ENTRYAGGREGATOR => 'AND',
+ CASESENSITIVE => 0,
+ ) );
+ $self->_CloseParen;
+ }
+ $self->_CloseParen;
+
+ # XXX: if we join via CustomFields table then
+ # because of order of left joins we get NULLs in
+ # CF table and then get nulls for those records
+ # in OCFVs table what result in wrong results
+ # as decifer method now tries to load a CF then
+ # we fall into this situation only when there
+ # are more than one CF with the name in the DB.
+ # the same thing applies to order by call.
+ # TODO: reorder joins T <- OCFVs <- CFs <- OCFs if
+ # we want treat IS NULL as (not applies or has
+ # no value)
+ $self->Limit(
+ ALIAS => $CFs,
+ FIELD => 'Name',
+ OPERATOR => 'IS NOT',
+ VALUE => 'NULL',
+ QUOTEVALUE => 0,
+ ENTRYAGGREGATOR => 'AND',
+ ) if $CFs;
+ $self->_CloseParen;
+
+ if ($negative_op) {
+ $self->Limit(
+ ALIAS => $TicketCFs,
+ FIELD => $column || 'Content',
+ OPERATOR => 'IS',
+ VALUE => 'NULL',
+ QUOTEVALUE => 0,
+ ENTRYAGGREGATOR => 'OR',
+ );
+ }
+
+ $self->_CloseParen;
+ }
+ }
+ else {
+ $cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++;
+ my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+
+ # reverse operation
+ $op =~ s/!|NOT\s+//i;
+
+ # if column is defined then deal only with it
+ # otherwise search in Content and in LargeContent
+ if ( $column ) {
+ $self->Limit( $fix_op->(
+ LEFTJOIN => $TicketCFs,
+ ALIAS => $TicketCFs,
+ FIELD => $column,
+ OPERATOR => $op,
+ VALUE => $value,
+ CASESENSITIVE => 0,
+ ) );
+ }
+ else {
+ $self->Limit(
+ LEFTJOIN => $TicketCFs,
+ ALIAS => $TicketCFs,
+ FIELD => 'Content',
+ OPERATOR => $op,
+ VALUE => $value,
+ CASESENSITIVE => 0,
+ );
+ }
+ $self->Limit(
+ %rest,
+ ALIAS => $TicketCFs,
+ FIELD => 'id',
+ OPERATOR => 'IS',
+ VALUE => 'NULL',
+ QUOTEVALUE => 0,
+ );
+ }
+}
+
=head2 Limit PARAMHASH
This Limit sub calls SUPER::Limit, but defaults "CASESENSITIVE" to 1, thus
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 1052d5f..16136c8 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1082,105 +1082,6 @@ sub _CustomFieldDecipher {
return ($queue, $field, $cf, $column);
}
-=head2 _CustomFieldJoin
-
-Factor out the Join of custom fields so we can use it for sorting too
-
-=cut
-
-sub _CustomFieldJoin {
- my ($self, $cfkey, $cfid, $field) = @_;
- # Perform one Join per CustomField
- if ( $self->{_sql_object_cfv_alias}{$cfkey} ||
- $self->{_sql_cf_alias}{$cfkey} )
- {
- return ( $self->{_sql_object_cfv_alias}{$cfkey},
- $self->{_sql_cf_alias}{$cfkey} );
- }
-
- my ($TicketCFs, $CFs);
- if ( $cfid ) {
- $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
- TYPE => 'LEFT',
- ALIAS1 => 'main',
- FIELD1 => 'id',
- TABLE2 => 'ObjectCustomFieldValues',
- FIELD2 => 'ObjectId',
- );
- $self->Limit(
- LEFTJOIN => $TicketCFs,
- FIELD => 'CustomField',
- VALUE => $cfid,
- ENTRYAGGREGATOR => 'AND'
- );
- }
- else {
- my $ocfalias = $self->Join(
- TYPE => 'LEFT',
- FIELD1 => 'Queue',
- TABLE2 => 'ObjectCustomFields',
- FIELD2 => 'ObjectId',
- );
-
- $self->Limit(
- LEFTJOIN => $ocfalias,
- ENTRYAGGREGATOR => 'OR',
- FIELD => 'ObjectId',
- VALUE => '0',
- );
-
- $CFs = $self->{_sql_cf_alias}{$cfkey} = $self->Join(
- TYPE => 'LEFT',
- ALIAS1 => $ocfalias,
- FIELD1 => 'CustomField',
- TABLE2 => 'CustomFields',
- FIELD2 => 'id',
- );
- $self->Limit(
- LEFTJOIN => $CFs,
- ENTRYAGGREGATOR => 'AND',
- FIELD => 'LookupType',
- VALUE => 'RT::Queue-RT::Ticket',
- );
- $self->Limit(
- LEFTJOIN => $CFs,
- ENTRYAGGREGATOR => 'AND',
- FIELD => 'Name',
- VALUE => $field,
- );
-
- $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
- TYPE => 'LEFT',
- ALIAS1 => $CFs,
- FIELD1 => 'id',
- TABLE2 => 'ObjectCustomFieldValues',
- FIELD2 => 'CustomField',
- );
- $self->Limit(
- LEFTJOIN => $TicketCFs,
- FIELD => 'ObjectId',
- VALUE => 'main.id',
- QUOTEVALUE => 0,
- ENTRYAGGREGATOR => 'AND',
- );
- }
- $self->Limit(
- LEFTJOIN => $TicketCFs,
- FIELD => 'ObjectType',
- VALUE => 'RT::Ticket',
- ENTRYAGGREGATOR => 'AND'
- );
- $self->Limit(
- LEFTJOIN => $TicketCFs,
- FIELD => 'Disabled',
- OPERATOR => '=',
- VALUE => '0',
- ENTRYAGGREGATOR => 'AND'
- );
-
- return ($TicketCFs, $CFs);
-}
-
=head2 _CustomFieldLimit
Limit based on CustomFields
@@ -1190,10 +1091,6 @@ Meta Data:
=cut
-use Regexp::Common qw(RE_net_IPv4);
-use Regexp::Common::net::CIDR;
-
-
sub _CustomFieldLimit {
my ( $self, $_field, $op, $value, %rest ) = @_;
@@ -1205,366 +1102,7 @@ sub _CustomFieldLimit {
($queue, $field, $cf, $column) = $self->_CustomFieldDecipher( $field );
$cfid = $cf ? $cf->id : 0 ;
-# If we're trying to find custom fields that don't match something, we
-# want tickets where the custom field has no value at all. Note that
-# we explicitly don't include the "IS NULL" case, since we would
-# otherwise end up with a redundant clause.
-
- my $negative_op = ($op eq '!=' || $op =~ /\bNOT\b/i);
- my $null_op = ( 'is not' eq lc($op) || 'is' eq lc($op) );
-
- my $fix_op = sub {
- return @_ unless RT->Config->Get('DatabaseType') eq 'Oracle';
-
- my %args = @_;
- return %args unless $args{'FIELD'} eq 'LargeContent';
-
- my $op = $args{'OPERATOR'};
- if ( $op eq '=' ) {
- $args{'OPERATOR'} = 'MATCHES';
- }
- elsif ( $op eq '!=' ) {
- $args{'OPERATOR'} = 'NOT MATCHES';
- }
- elsif ( $op =~ /^[<>]=?$/ ) {
- $args{'FUNCTION'} = "TO_CHAR( $args{'ALIAS'}.LargeContent )";
- }
- return %args;
- };
-
- if ( $cf && $cf->Type eq 'IPAddress' ) {
- my $parsed = RT::ObjectCustomFieldValue->ParseIP($value);
- if ($parsed) {
- $value = $parsed;
- }
- else {
- $RT::Logger->warn("$value is not a valid IPAddress");
- }
- }
-
- if ( $cf && $cf->Type eq 'IPAddressRange' ) {
-
- if ( $value =~ /^\s*$RE{net}{CIDR}{IPv4}{-keep}\s*$/o ) {
-
- # convert incomplete 192.168/24 to 192.168.0.0/24 format
- $value =
- join( '.', map $_ || 0, ( split /\./, $1 )[ 0 .. 3 ] ) . "/$2"
- || $value;
- }
-
- my ( $start_ip, $end_ip ) =
- RT::ObjectCustomFieldValue->ParseIPRange($value);
- if ( $start_ip && $end_ip ) {
- if ( $op =~ /^([<>])=?$/ ) {
- my $is_less = $1 eq '<' ? 1 : 0;
- if ( $is_less ) {
- $value = $start_ip;
- }
- else {
- $value = $end_ip;
- }
- }
- else {
- $value = join '-', $start_ip, $end_ip;
- }
- }
- else {
- $RT::Logger->warn("$value is not a valid IPAddressRange");
- }
- }
-
- my $single_value = !$cf || !$cfid || $cf->SingleValue;
-
- my $cfkey = $cfid ? $cfid : "$queue.$field";
-
- if ( $null_op && !$column ) {
- # IS[ NOT] NULL without column is the same as has[ no] any CF value,
- # we can reuse our default joins for this operation
- # with column specified we have different situation
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
- $self->_OpenParen;
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'id',
- OPERATOR => $op,
- VALUE => $value,
- %rest
- );
- $self->Limit(
- ALIAS => $CFs,
- FIELD => 'Name',
- OPERATOR => 'IS NOT',
- VALUE => 'NULL',
- QUOTEVALUE => 0,
- ENTRYAGGREGATOR => 'AND',
- ) if $CFs;
- $self->_CloseParen;
- }
- elsif ( $op !~ /^[<>]=?$/ && ( $cf && $cf->Type eq 'IPAddressRange')) {
-
- my ($start_ip, $end_ip) = split /-/, $value;
-
- $self->_OpenParen;
- if ( $op !~ /NOT|!=|<>/i ) { # positive equation
- $self->_CustomFieldLimit(
- 'CF', '<=', $end_ip, %rest,
- SUBKEY => $rest{'SUBKEY'}. '.Content',
- );
- $self->_CustomFieldLimit(
- 'CF', '>=', $start_ip, %rest,
- SUBKEY => $rest{'SUBKEY'}. '.LargeContent',
- ENTRYAGGREGATOR => 'AND',
- );
- # as well limit borders so DB optimizers can use better
- # estimations and scan less rows
-# have to disable this tweak because of ipv6
-# $self->_CustomFieldLimit(
-# $field, '>=', '000.000.000.000', %rest,
-# SUBKEY => $rest{'SUBKEY'}. '.Content',
-# ENTRYAGGREGATOR => 'AND',
-# );
-# $self->_CustomFieldLimit(
-# $field, '<=', '255.255.255.255', %rest,
-# SUBKEY => $rest{'SUBKEY'}. '.LargeContent',
-# ENTRYAGGREGATOR => 'AND',
-# );
- }
- else { # negative equation
- $self->_CustomFieldLimit($field, '>', $end_ip, %rest);
- $self->_CustomFieldLimit(
- $field, '<', $start_ip, %rest,
- SUBKEY => $rest{'SUBKEY'}. '.LargeContent',
- ENTRYAGGREGATOR => 'OR',
- );
- # TODO: as well limit borders so DB optimizers can use better
- # estimations and scan less rows, but it's harder to do
- # as we have OR aggregator
- }
- $self->_CloseParen;
- }
- elsif ( !$negative_op || $single_value ) {
- $cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
-
- $self->_OpenParen;
-
- $self->_OpenParen;
-
- $self->_OpenParen;
- # if column is defined then deal only with it
- # otherwise search in Content and in LargeContent
- if ( $column ) {
- $self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
- FIELD => $column,
- OPERATOR => $op,
- VALUE => $value,
- CASESENSITIVE => 0,
- %rest
- ) );
- $self->_CloseParen;
- $self->_CloseParen;
- $self->_CloseParen;
- }
- else {
- # need special treatment for Date
- if ( $cf and $cf->Type eq 'DateTime' and $op eq '=' ) {
-
- if ( $value =~ /:/ ) {
- # there is time speccified.
- my $date = RT::Date->new( $self->CurrentUser );
- $date->Set( Format => 'unknown', Value => $value );
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => "=",
- VALUE => $date->ISO,
- %rest,
- );
- }
- else {
- # no time specified, that means we want everything on a
- # particular day. in the database, we need to check for >
- # and < the edges of that day.
- my $date = RT::Date->new( $self->CurrentUser );
- $date->Set( Format => 'unknown', Value => $value );
- $date->SetToMidnight( Timezone => 'server' );
- my $daystart = $date->ISO;
- $date->AddDay;
- my $dayend = $date->ISO;
-
- $self->_OpenParen;
-
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => ">=",
- VALUE => $daystart,
- %rest,
- );
-
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => "<=",
- VALUE => $dayend,
- %rest,
- ENTRYAGGREGATOR => 'AND',
- );
-
- $self->_CloseParen;
- }
- }
- elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
- if ( length( Encode::encode_utf8($value) ) < 256 ) {
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => $op,
- VALUE => $value,
- CASESENSITIVE => 0,
- %rest
- );
- }
- else {
- $self->_OpenParen;
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => '=',
- VALUE => '',
- ENTRYAGGREGATOR => 'OR'
- );
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => 'IS',
- VALUE => 'NULL',
- ENTRYAGGREGATOR => 'OR'
- );
- $self->_CloseParen;
- $self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
- FIELD => 'LargeContent',
- OPERATOR => $op,
- VALUE => $value,
- ENTRYAGGREGATOR => 'AND',
- CASESENSITIVE => 0,
- ) );
- }
- }
- else {
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => $op,
- VALUE => $value,
- CASESENSITIVE => 0,
- %rest
- );
-
- $self->_OpenParen;
- $self->_OpenParen;
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => '=',
- VALUE => '',
- ENTRYAGGREGATOR => 'OR'
- );
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => 'IS',
- VALUE => 'NULL',
- ENTRYAGGREGATOR => 'OR'
- );
- $self->_CloseParen;
- $self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
- FIELD => 'LargeContent',
- OPERATOR => $op,
- VALUE => $value,
- ENTRYAGGREGATOR => 'AND',
- CASESENSITIVE => 0,
- ) );
- $self->_CloseParen;
- }
- $self->_CloseParen;
-
- # XXX: if we join via CustomFields table then
- # because of order of left joins we get NULLs in
- # CF table and then get nulls for those records
- # in OCFVs table what result in wrong results
- # as decifer method now tries to load a CF then
- # we fall into this situation only when there
- # are more than one CF with the name in the DB.
- # the same thing applies to order by call.
- # TODO: reorder joins T <- OCFVs <- CFs <- OCFs if
- # we want treat IS NULL as (not applies or has
- # no value)
- $self->Limit(
- ALIAS => $CFs,
- FIELD => 'Name',
- OPERATOR => 'IS NOT',
- VALUE => 'NULL',
- QUOTEVALUE => 0,
- ENTRYAGGREGATOR => 'AND',
- ) if $CFs;
- $self->_CloseParen;
-
- if ($negative_op) {
- $self->Limit(
- ALIAS => $TicketCFs,
- FIELD => $column || 'Content',
- OPERATOR => 'IS',
- VALUE => 'NULL',
- QUOTEVALUE => 0,
- ENTRYAGGREGATOR => 'OR',
- );
- }
-
- $self->_CloseParen;
- }
- }
- else {
- $cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
-
- # reverse operation
- $op =~ s/!|NOT\s+//i;
-
- # if column is defined then deal only with it
- # otherwise search in Content and in LargeContent
- if ( $column ) {
- $self->Limit( $fix_op->(
- LEFTJOIN => $TicketCFs,
- ALIAS => $TicketCFs,
- FIELD => $column,
- OPERATOR => $op,
- VALUE => $value,
- CASESENSITIVE => 0,
- ) );
- }
- else {
- $self->Limit(
- LEFTJOIN => $TicketCFs,
- ALIAS => $TicketCFs,
- FIELD => 'Content',
- OPERATOR => $op,
- VALUE => $value,
- CASESENSITIVE => 0,
- );
- }
- $self->Limit(
- %rest,
- ALIAS => $TicketCFs,
- FIELD => 'id',
- OPERATOR => 'IS',
- VALUE => 'NULL',
- QUOTEVALUE => 0,
- );
- }
+ $self->_LimitCustomField( $field, $queue, $cfid, $cf, $column, $op, $value, %rest );
}
sub _HasAttributeLimit {
commit 0875d454d21cbbe2bdae4d911883830644cc6318
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:18:52 2013 -0500
Rename $TicketCFs variable to be more general
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 7514170..911ff01 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -218,9 +218,9 @@ sub _CustomFieldJoin {
$self->{_sql_cf_alias}{$cfkey} );
}
- my ($TicketCFs, $CFs);
+ my ($ocfvalias, $CFs);
if ( $cfid ) {
- $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
+ $ocfvalias = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
TYPE => 'LEFT',
ALIAS1 => 'main',
FIELD1 => 'id',
@@ -228,7 +228,7 @@ sub _CustomFieldJoin {
FIELD2 => 'ObjectId',
);
$self->Limit(
- LEFTJOIN => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
FIELD => 'CustomField',
VALUE => $cfid,
ENTRYAGGREGATOR => 'AND'
@@ -269,7 +269,7 @@ sub _CustomFieldJoin {
VALUE => $field,
);
- $TicketCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
+ $ocfvalias = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
TYPE => 'LEFT',
ALIAS1 => $CFs,
FIELD1 => 'id',
@@ -277,7 +277,7 @@ sub _CustomFieldJoin {
FIELD2 => 'CustomField',
);
$self->Limit(
- LEFTJOIN => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
FIELD => 'ObjectId',
VALUE => 'main.id',
QUOTEVALUE => 0,
@@ -285,20 +285,20 @@ sub _CustomFieldJoin {
);
}
$self->Limit(
- LEFTJOIN => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
FIELD => 'ObjectType',
VALUE => 'RT::Ticket',
ENTRYAGGREGATOR => 'AND'
);
$self->Limit(
- LEFTJOIN => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
FIELD => 'Disabled',
OPERATOR => '=',
VALUE => '0',
ENTRYAGGREGATOR => 'AND'
);
- return ($TicketCFs, $CFs);
+ return ($ocfvalias, $CFs);
}
sub LimitCustomField {
@@ -425,10 +425,10 @@ sub _LimitCustomField {
# IS[ NOT] NULL without column is the same as has[ no] any CF value,
# we can reuse our default joins for this operation
# with column specified we have different situation
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
$self->_OpenParen;
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'id',
OPERATOR => $op,
VALUE => $value,
@@ -485,7 +485,7 @@ sub _LimitCustomField {
}
elsif ( !$negative_op || $single_value ) {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
$self->_OpenParen;
@@ -496,7 +496,7 @@ sub _LimitCustomField {
# otherwise search in Content and in LargeContent
if ( $column ) {
$self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => $column,
OPERATOR => $op,
VALUE => $value,
@@ -516,7 +516,7 @@ sub _LimitCustomField {
my $date = RT::Date->new( $self->CurrentUser );
$date->Set( Format => 'unknown', Value => $value );
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => "=",
VALUE => $date->ISO,
@@ -537,7 +537,7 @@ sub _LimitCustomField {
$self->_OpenParen;
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => ">=",
VALUE => $daystart,
@@ -545,7 +545,7 @@ sub _LimitCustomField {
);
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => "<=",
VALUE => $dayend,
@@ -559,7 +559,7 @@ sub _LimitCustomField {
elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
if ( length( Encode::encode_utf8($value) ) < 256 ) {
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => $op,
VALUE => $value,
@@ -570,14 +570,14 @@ sub _LimitCustomField {
else {
$self->_OpenParen;
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => '=',
VALUE => '',
ENTRYAGGREGATOR => 'OR'
);
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => 'IS',
VALUE => 'NULL',
@@ -585,7 +585,7 @@ sub _LimitCustomField {
);
$self->_CloseParen;
$self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'LargeContent',
OPERATOR => $op,
VALUE => $value,
@@ -596,7 +596,7 @@ sub _LimitCustomField {
}
else {
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => $op,
VALUE => $value,
@@ -607,14 +607,14 @@ sub _LimitCustomField {
$self->_OpenParen;
$self->_OpenParen;
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => '=',
VALUE => '',
ENTRYAGGREGATOR => 'OR'
);
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => 'IS',
VALUE => 'NULL',
@@ -622,7 +622,7 @@ sub _LimitCustomField {
);
$self->_CloseParen;
$self->Limit( $fix_op->(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'LargeContent',
OPERATOR => $op,
VALUE => $value,
@@ -656,7 +656,7 @@ sub _LimitCustomField {
if ($negative_op) {
$self->Limit(
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => $column || 'Content',
OPERATOR => 'IS',
VALUE => 'NULL',
@@ -670,7 +670,7 @@ sub _LimitCustomField {
}
else {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
# reverse operation
$op =~ s/!|NOT\s+//i;
@@ -679,8 +679,8 @@ sub _LimitCustomField {
# otherwise search in Content and in LargeContent
if ( $column ) {
$self->Limit( $fix_op->(
- LEFTJOIN => $TicketCFs,
- ALIAS => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
+ ALIAS => $ocfvalias,
FIELD => $column,
OPERATOR => $op,
VALUE => $value,
@@ -689,8 +689,8 @@ sub _LimitCustomField {
}
else {
$self->Limit(
- LEFTJOIN => $TicketCFs,
- ALIAS => $TicketCFs,
+ LEFTJOIN => $ocfvalias,
+ ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => $op,
VALUE => $value,
@@ -699,7 +699,7 @@ sub _LimitCustomField {
}
$self->Limit(
%rest,
- ALIAS => $TicketCFs,
+ ALIAS => $ocfvalias,
FIELD => 'id',
OPERATOR => 'IS',
VALUE => 'NULL',
commit 226eec4672a6bcbdf1a5528f83129ad5d90fcfa8
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:23:18 2013 -0500
Simplify _CustomFieldJoin to take a key and a CF||string
The logic surrounding the arguments for _CustomFieldJoin is more complex
than necessary; simplify it by expecting either a CF name of a CF object.
diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index 0922dbb..331702f 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -246,7 +246,7 @@ sub _FieldToFunction {
unless ( $cf->id ) {
$RT::Logger->error("Couldn't load CustomField #$cf_name");
} else {
- my ($ticket_cf_alias, $cf_alias) = $self->_CustomFieldJoin($cf->id, $cf->id, $cf_name);
+ my ($ticket_cf_alias, $cf_alias) = $self->_CustomFieldJoin($cf->id, $cf);
@args{qw(ALIAS FIELD)} = ($ticket_cf_alias, 'Content');
}
} elsif ( $field =~ /^(?:(Owner|Creator|LastUpdatedBy))(?:\.(.*))?$/ ) {
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 911ff01..7187c6c 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -72,6 +72,8 @@ use base qw(DBIx::SearchBuilder RT::Base);
use RT::Base;
use DBIx::SearchBuilder "1.40";
+use Scalar::Util qw/blessed/;
+
sub _Init {
my $self = shift;
@@ -209,7 +211,7 @@ Factor out the Join of custom fields so we can use it for sorting too
=cut
sub _CustomFieldJoin {
- my ($self, $cfkey, $cfid, $field) = @_;
+ my ($self, $cfkey, $cf) = @_;
# Perform one Join per CustomField
if ( $self->{_sql_object_cfv_alias}{$cfkey} ||
$self->{_sql_cf_alias}{$cfkey} )
@@ -219,7 +221,7 @@ sub _CustomFieldJoin {
}
my ($ocfvalias, $CFs);
- if ( $cfid ) {
+ if ( blessed($cf) ) {
$ocfvalias = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
TYPE => 'LEFT',
ALIAS1 => 'main',
@@ -230,7 +232,7 @@ sub _CustomFieldJoin {
$self->Limit(
LEFTJOIN => $ocfvalias,
FIELD => 'CustomField',
- VALUE => $cfid,
+ VALUE => $cf->id,
ENTRYAGGREGATOR => 'AND'
);
}
@@ -266,7 +268,7 @@ sub _CustomFieldJoin {
LEFTJOIN => $CFs,
ENTRYAGGREGATOR => 'AND',
FIELD => 'Name',
- VALUE => $field,
+ VALUE => $cf,
);
$ocfvalias = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(
@@ -425,7 +427,7 @@ sub _LimitCustomField {
# IS[ NOT] NULL without column is the same as has[ no] any CF value,
# we can reuse our default joins for this operation
# with column specified we have different situation
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
$self->_OpenParen;
$self->Limit(
ALIAS => $ocfvalias,
@@ -485,7 +487,7 @@ sub _LimitCustomField {
}
elsif ( !$negative_op || $single_value ) {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
$self->_OpenParen;
@@ -670,7 +672,7 @@ sub _LimitCustomField {
}
else {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++;
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
# reverse operation
$op =~ s/!|NOT\s+//i;
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 16136c8..1fed42e 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1210,7 +1210,7 @@ sub OrderByCols {
my ($queue, $field, $cf_obj, $column) = $self->_CustomFieldDecipher( $subkey );
my $cfkey = $cf_obj ? $cf_obj->id : "$queue.$field";
$cfkey .= ".ordering" if !$cf_obj || ($cf_obj->MaxValues||0) != 1;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf_obj ?$cf_obj->id :0) , $field );
+ my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf_obj || $field) );
# this is described in _CustomFieldLimit
$self->Limit(
ALIAS => $CFs,
commit 64a70f9cae6ccb43edb3052c6fa1cc39db223517
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:29:18 2013 -0500
Switch to a more standard paramhash for arguments
This also collapses the $cfid, $cf, $queue, and $field arguments down
into the more understandable KEY and CUSTOMFIELD.
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 7187c6c..d1ef45f 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -348,8 +348,22 @@ use Regexp::Common::net::CIDR;
sub _LimitCustomField {
my $self = shift;
- my ( $field, $queue, $cfid, $cf, $column, $op, $value, %rest ) = @_;
+ my %args = ( VALUE => undef,
+ CUSTOMFIELD => undef,
+ OPERATOR => '=',
+ KEY => undef,
+ @_ );
+ my $op = delete $args{OPERATOR};
+ my $value = delete $args{VALUE};
+ my $cf = delete $args{CUSTOMFIELD};
+ my $column = delete $args{COLUMN};
+ my $cfkey = delete $args{KEY};
+ if (blessed($cf) and $cf->id) {
+ $cfkey ||= $cf->id;
+ } else {
+ $cfkey ||= $cf;
+ }
# If we're trying to find custom fields that don't match something, we
# want tickets where the custom field has no value at all. Note that
@@ -378,7 +392,7 @@ sub _LimitCustomField {
return %args;
};
- if ( $cf && $cf->Type eq 'IPAddress' ) {
+ if ( blessed($cf) && $cf->Type eq 'IPAddress' ) {
my $parsed = RT::ObjectCustomFieldValue->ParseIP($value);
if ($parsed) {
$value = $parsed;
@@ -388,7 +402,7 @@ sub _LimitCustomField {
}
}
- if ( $cf && $cf->Type eq 'IPAddressRange' ) {
+ if ( blessed($cf) && $cf->Type eq 'IPAddressRange' ) {
if ( $value =~ /^\s*$RE{net}{CIDR}{IPv4}{-keep}\s*$/o ) {
@@ -419,22 +433,20 @@ sub _LimitCustomField {
}
}
- my $single_value = !$cf || !$cfid || $cf->SingleValue;
-
- my $cfkey = $cfid ? $cfid : "$queue.$field";
+ my $single_value = !blessed($cf) || $cf->SingleValue;
if ( $null_op && !$column ) {
# IS[ NOT] NULL without column is the same as has[ no] any CF value,
# we can reuse our default joins for this operation
# with column specified we have different situation
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
$self->_OpenParen;
$self->Limit(
ALIAS => $ocfvalias,
FIELD => 'id',
OPERATOR => $op,
VALUE => $value,
- %rest
+ %args
);
$self->Limit(
ALIAS => $CFs,
@@ -446,19 +458,26 @@ sub _LimitCustomField {
) if $CFs;
$self->_CloseParen;
}
- elsif ( $op !~ /^[<>]=?$/ && ( $cf && $cf->Type eq 'IPAddressRange')) {
-
+ elsif ( $op !~ /^[<>]=?$/ && ( blessed($cf) && $cf->Type eq 'IPAddressRange')) {
my ($start_ip, $end_ip) = split /-/, $value;
$self->_OpenParen;
if ( $op !~ /NOT|!=|<>/i ) { # positive equation
$self->_LimitCustomField(
- $field, $queue, $cfid, $cf, 'Content', '<=', $end_ip, %rest,
+ OPERATOR => '<=',
+ VALUE => $end_ip,
+ CUSTOMFIELD => $cf,
+ COLUMN => 'Content',
+ %args,
);
$self->_LimitCustomField(
- $field, $queue, $cfid, $cf, 'LargeContent', '>=', $start_ip, %rest,
+ OPERATOR => '>=',
+ VALUE => $start_ip,
+ CUSTOMFIELD => $cf,
+ COLUMN => 'LargeContent',
+ %args,
ENTRYAGGREGATOR => 'AND',
- );
+ );
# as well limit borders so DB optimizers can use better
# estimations and scan less rows
# have to disable this tweak because of ipv6
@@ -474,11 +493,21 @@ sub _LimitCustomField {
# );
}
else { # negative equation
- $self->_LimitCustomField( $field, $queue, $cfid, $cf, 'Content', '>', $end_ip, %rest);
$self->_LimitCustomField(
- $field, $queue, $cfid, $cf, 'LargeContent', '<', $start_ip, %rest,
+ OPERATOR => '>',
+ VALUE => $end_ip,
+ CUSTOMFIELD => $cf,
+ COLUMN => 'Content',
+ %args,
+ );
+ $self->_LimitCustomField(
+ OPERATOR => '<',
+ VALUE => $start_ip,
+ CUSTOMFIELD => $cf,
+ COLUMN => 'LargeContent',
+ %args,
ENTRYAGGREGATOR => 'OR',
- );
+ );
# TODO: as well limit borders so DB optimizers can use better
# estimations and scan less rows, but it's harder to do
# as we have OR aggregator
@@ -487,7 +516,7 @@ sub _LimitCustomField {
}
elsif ( !$negative_op || $single_value ) {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
$self->_OpenParen;
@@ -503,7 +532,7 @@ sub _LimitCustomField {
OPERATOR => $op,
VALUE => $value,
CASESENSITIVE => 0,
- %rest
+ %args
) );
$self->_CloseParen;
$self->_CloseParen;
@@ -511,7 +540,7 @@ sub _LimitCustomField {
}
else {
# need special treatment for Date
- if ( $cf and $cf->Type eq 'DateTime' and $op eq '=' ) {
+ if ( blessed($cf) and $cf->Type eq 'DateTime' and $op eq '=' ) {
if ( $value =~ /:/ ) {
# there is time speccified.
@@ -522,7 +551,7 @@ sub _LimitCustomField {
FIELD => 'Content',
OPERATOR => "=",
VALUE => $date->ISO,
- %rest,
+ %args,
);
}
else {
@@ -543,7 +572,7 @@ sub _LimitCustomField {
FIELD => 'Content',
OPERATOR => ">=",
VALUE => $daystart,
- %rest,
+ %args,
);
$self->Limit(
@@ -551,7 +580,7 @@ sub _LimitCustomField {
FIELD => 'Content',
OPERATOR => "<=",
VALUE => $dayend,
- %rest,
+ %args,
ENTRYAGGREGATOR => 'AND',
);
@@ -566,7 +595,7 @@ sub _LimitCustomField {
OPERATOR => $op,
VALUE => $value,
CASESENSITIVE => 0,
- %rest
+ %args
);
}
else {
@@ -603,7 +632,7 @@ sub _LimitCustomField {
OPERATOR => $op,
VALUE => $value,
CASESENSITIVE => 0,
- %rest
+ %args
);
$self->_OpenParen;
@@ -672,7 +701,7 @@ sub _LimitCustomField {
}
else {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++;
- my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf || $field) );
+ my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
# reverse operation
$op =~ s/!|NOT\s+//i;
@@ -700,7 +729,7 @@ sub _LimitCustomField {
);
}
$self->Limit(
- %rest,
+ %args,
ALIAS => $ocfvalias,
FIELD => 'id',
OPERATOR => 'IS',
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 1fed42e..5914bd9 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1100,9 +1100,16 @@ sub _CustomFieldLimit {
my ($queue, $cfid, $cf, $column);
($queue, $field, $cf, $column) = $self->_CustomFieldDecipher( $field );
- $cfid = $cf ? $cf->id : 0 ;
- $self->_LimitCustomField( $field, $queue, $cfid, $cf, $column, $op, $value, %rest );
+
+ $self->_LimitCustomField(
+ %rest,
+ CUSTOMFIELD => $cf || $field,
+ KEY => $cf ? $cf->id : "$queue.$field",
+ OPERATOR => $op,
+ VALUE => $value,
+ SUBCLAUSE => "ticketsql",
+ );
}
sub _HasAttributeLimit {
commit 24ed815989c877b182c2f0e95cd2665cd2bbc01f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:30:20 2013 -0500
Generalize _CustomFieldJoin somewhat
This replaces explicit RT::Ticket ObjectTypes and LookupTypes with their
more general forms. However, if a CF name (and not object) is passed
in, this only attempts to search global CFs of the appropriate object
type. The logic to limit non-global CFs (for instance, joining
transactions to tickets to queues) does not exist yet.
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index d1ef45f..347ec54 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -239,7 +239,7 @@ sub _CustomFieldJoin {
else {
my $ocfalias = $self->Join(
TYPE => 'LEFT',
- FIELD1 => 'Queue',
+ EXPRESSION => q|'0'|,
TABLE2 => 'ObjectCustomFields',
FIELD2 => 'ObjectId',
);
@@ -248,8 +248,9 @@ sub _CustomFieldJoin {
LEFTJOIN => $ocfalias,
ENTRYAGGREGATOR => 'OR',
FIELD => 'ObjectId',
- VALUE => '0',
- );
+ VALUE => 'main.Queue',
+ QUOTEVALUE => 0,
+ ) if $self->isa("RT::Tickets");
$CFs = $self->{_sql_cf_alias}{$cfkey} = $self->Join(
TYPE => 'LEFT',
@@ -262,7 +263,7 @@ sub _CustomFieldJoin {
LEFTJOIN => $CFs,
ENTRYAGGREGATOR => 'AND',
FIELD => 'LookupType',
- VALUE => 'RT::Queue-RT::Ticket',
+ VALUE => $self->NewItem->CustomFieldLookupType,
);
$self->Limit(
LEFTJOIN => $CFs,
@@ -289,7 +290,7 @@ sub _CustomFieldJoin {
$self->Limit(
LEFTJOIN => $ocfvalias,
FIELD => 'ObjectType',
- VALUE => 'RT::Ticket',
+ VALUE => ref($self->NewItem),
ENTRYAGGREGATOR => 'AND'
);
$self->Limit(
commit 496ed6bdc0c9926074a4f9a2c08c93bd63605090
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:31:32 2013 -0500
Add explicit subclauses to all limits
RT::Tickets assumes a subclause of "ticketsql" for all Limit and
_OpenParen / _CloseParen calls. Allow calling on non-Tickets
collections by providing a default SUBCLAUSE name, and performing all
Limit, _OpenParen, and _CloseParen adjustments therein.
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 347ec54..96fd32f 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -366,6 +366,8 @@ sub _LimitCustomField {
$cfkey ||= $cf;
}
+ $args{SUBCLAUSE} ||= "cf-$cfkey";
+
# If we're trying to find custom fields that don't match something, we
# want tickets where the custom field has no value at all. Note that
# we explicitly don't include the "IS NULL" case, since we would
@@ -441,7 +443,7 @@ sub _LimitCustomField {
# we can reuse our default joins for this operation
# with column specified we have different situation
my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
$self->Limit(
ALIAS => $ocfvalias,
FIELD => 'id',
@@ -457,12 +459,11 @@ sub _LimitCustomField {
QUOTEVALUE => 0,
ENTRYAGGREGATOR => 'AND',
) if $CFs;
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
elsif ( $op !~ /^[<>]=?$/ && ( blessed($cf) && $cf->Type eq 'IPAddressRange')) {
my ($start_ip, $end_ip) = split /-/, $value;
-
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
if ( $op !~ /NOT|!=|<>/i ) { # positive equation
$self->_LimitCustomField(
OPERATOR => '<=',
@@ -513,17 +514,15 @@ sub _LimitCustomField {
# estimations and scan less rows, but it's harder to do
# as we have OR aggregator
}
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
elsif ( !$negative_op || $single_value ) {
$cfkey .= '.'. $self->{'_sql_multiple_cfs_index'}++ if not $single_value and not $op =~ /^[<>]=?$/;
my ($ocfvalias, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
- $self->_OpenParen;
-
- $self->_OpenParen;
-
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
+ $self->_OpenParen( $args{SUBCLAUSE} );
+ $self->_OpenParen( $args{SUBCLAUSE} );
# if column is defined then deal only with it
# otherwise search in Content and in LargeContent
if ( $column ) {
@@ -535,9 +534,9 @@ sub _LimitCustomField {
CASESENSITIVE => 0,
%args
) );
- $self->_CloseParen;
- $self->_CloseParen;
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
+ $self->_CloseParen( $args{SUBCLAUSE} );
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
else {
# need special treatment for Date
@@ -566,7 +565,7 @@ sub _LimitCustomField {
$date->AddDay;
my $dayend = $date->ISO;
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
$self->Limit(
ALIAS => $ocfvalias,
@@ -585,7 +584,7 @@ sub _LimitCustomField {
ENTRYAGGREGATOR => 'AND',
);
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
}
elsif ( $op eq '=' || $op eq '!=' || $op eq '<>' ) {
@@ -600,28 +599,31 @@ sub _LimitCustomField {
);
}
else {
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
$self->Limit(
ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => '=',
VALUE => '',
- ENTRYAGGREGATOR => 'OR'
+ ENTRYAGGREGATOR => 'OR',
+ SUBCLAUSE => $args{SUBCLAUSE},
);
$self->Limit(
ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => 'IS',
VALUE => 'NULL',
+ SUBCLAUSE => $args{SUBCLAUSE},
ENTRYAGGREGATOR => 'OR'
);
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
$self->Limit( $fix_op->(
ALIAS => $ocfvalias,
FIELD => 'LargeContent',
OPERATOR => $op,
VALUE => $value,
ENTRYAGGREGATOR => 'AND',
+ SUBCLAUSE => $args{SUBCLAUSE},
CASESENSITIVE => 0,
) );
}
@@ -636,13 +638,14 @@ sub _LimitCustomField {
%args
);
- $self->_OpenParen;
- $self->_OpenParen;
+ $self->_OpenParen( $args{SUBCLAUSE} );
+ $self->_OpenParen( $args{SUBCLAUSE} );
$self->Limit(
ALIAS => $ocfvalias,
FIELD => 'Content',
OPERATOR => '=',
VALUE => '',
+ SUBCLAUSE => $args{SUBCLAUSE},
ENTRYAGGREGATOR => 'OR'
);
$self->Limit(
@@ -650,20 +653,22 @@ sub _LimitCustomField {
FIELD => 'Content',
OPERATOR => 'IS',
VALUE => 'NULL',
+ SUBCLAUSE => $args{SUBCLAUSE},
ENTRYAGGREGATOR => 'OR'
);
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
$self->Limit( $fix_op->(
ALIAS => $ocfvalias,
FIELD => 'LargeContent',
OPERATOR => $op,
VALUE => $value,
ENTRYAGGREGATOR => 'AND',
+ SUBCLAUSE => $args{SUBCLAUSE},
CASESENSITIVE => 0,
) );
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
# XXX: if we join via CustomFields table then
# because of order of left joins we get NULLs in
@@ -684,7 +689,7 @@ sub _LimitCustomField {
QUOTEVALUE => 0,
ENTRYAGGREGATOR => 'AND',
) if $CFs;
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
if ($negative_op) {
$self->Limit(
@@ -697,7 +702,7 @@ sub _LimitCustomField {
);
}
- $self->_CloseParen;
+ $self->_CloseParen( $args{SUBCLAUSE} );
}
}
else {
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 5914bd9..1375369 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1308,10 +1308,10 @@ sub _SQLJoin {
}
sub _OpenParen {
- $_[0]->SUPER::_OpenParen( 'ticketsql' );
+ $_[0]->SUPER::_OpenParen( $_[1] || 'ticketsql' );
}
sub _CloseParen {
- $_[0]->SUPER::_CloseParen( 'ticketsql' );
+ $_[0]->SUPER::_CloseParen( $_[1] || 'ticketsql' );
}
sub Limit {
commit bb9801963c71da8f44afd7ee46ff8be86df0d4ac
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 01:32:04 2013 -0500
Switch the general LimitCustomField to the new implementation
Use the new _LimitCustomField implementation for RT::SearchBuilder's
LimitCustomField. The former is not simply renamed to the latter
because RT::Tickets contains a LimitCustomField which acts on
"restrictions", and must continue to do so. As such, _LimitCustomField
(and its recursive calls) must continue to occupy some other name.
This removes the (dubious and unused) ability to call LimitCustomField
with no CUSTOMFIELD provided, which searches within all custom fields.
It adds all of the complex date and IP parsing capabilities that Tickets
have enjoyed.
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 96fd32f..1541258 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -306,42 +306,7 @@ sub _CustomFieldJoin {
sub LimitCustomField {
my $self = shift;
- my %args = ( VALUE => undef,
- CUSTOMFIELD => undef,
- OPERATOR => '=',
- @_ );
-
- my $alias = $self->Join(
- TYPE => 'left',
- ALIAS1 => 'main',
- FIELD1 => 'id',
- TABLE2 => 'ObjectCustomFieldValues',
- FIELD2 => 'ObjectId'
- );
- $self->Limit(
- ALIAS => $alias,
- FIELD => 'CustomField',
- OPERATOR => '=',
- VALUE => $args{'CUSTOMFIELD'},
- ) if ($args{'CUSTOMFIELD'});
- $self->Limit(
- ALIAS => $alias,
- FIELD => 'ObjectType',
- OPERATOR => '=',
- VALUE => $self->_SingularClass,
- );
- $self->Limit(
- ALIAS => $alias,
- FIELD => 'Content',
- OPERATOR => $args{'OPERATOR'},
- VALUE => $args{'VALUE'},
- );
- $self->Limit(
- ALIAS => $alias,
- FIELD => 'Disabled',
- OPERATOR => '=',
- VALUE => 0,
- );
+ return $self->_LimitCustomField( @_ );
}
use Regexp::Common qw(RE_net_IPv4);
@@ -362,6 +327,10 @@ sub _LimitCustomField {
my $cfkey = delete $args{KEY};
if (blessed($cf) and $cf->id) {
$cfkey ||= $cf->id;
+ } elsif ($cf =~ /^(\d+)$/) {
+ $cf = RT::CustomField->new( $self->CurrentUser );
+ $cf->Load($1);
+ $cfkey ||= $cf->id;
} else {
$cfkey ||= $cf;
}
commit 91cfc66564a346f4b473a29fa66d5a332ed1c33c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Jan 29 15:08:45 2013 -0500
Refactor CF ordering into a method on SearchBuilder
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 1541258..c4b3f74 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -121,6 +121,51 @@ sub JoinTransactions {
return $alias;
}
+sub _OrderByCF {
+ my $self = shift;
+ my ($row, $cf) = @_;
+
+ my $cfkey = blessed($cf) ? $cf->id : $cf;
+ $cfkey .= ".ordering" if !blessed($cf) || ($cf->MaxValues||0) != 1;
+ my ($ocfvs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cf );
+ # this is described in _LimitCustomField
+ $self->Limit(
+ ALIAS => $CFs,
+ FIELD => 'Name',
+ OPERATOR => 'IS NOT',
+ VALUE => 'NULL',
+ QUOTEVALUE => 1,
+ ENTRYAGGREGATOR => 'AND',
+ ) if $CFs;
+ unless (blessed($cf)) {
+ # For those cases where we are doing a join against the
+ # CF name, and don't have a CFid, use Unique to make sure
+ # we don't show duplicate tickets. NOTE: I'm pretty sure
+ # this will stay mixed in for the life of the
+ # class/package, and not just for the life of the object.
+ # Potential performance issue.
+ require DBIx::SearchBuilder::Unique;
+ DBIx::SearchBuilder::Unique->import;
+ }
+ my $CFvs = $self->Join(
+ TYPE => 'LEFT',
+ ALIAS1 => $ocfvs,
+ FIELD1 => 'CustomField',
+ TABLE2 => 'CustomFieldValues',
+ FIELD2 => 'CustomField',
+ );
+ $self->Limit(
+ LEFTJOIN => $CFvs,
+ FIELD => 'Name',
+ QUOTEVALUE => 0,
+ VALUE => "$ocfvs.Content",
+ ENTRYAGGREGATOR => 'AND'
+ );
+
+ return { %$row, ALIAS => $CFvs, FIELD => 'SortOrder' },
+ { %$row, ALIAS => $ocfvs, FIELD => 'Content' };
+}
+
sub OrderByCols {
my $self = shift;
my @sort;
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 1375369..0ea4e4d 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1214,46 +1214,8 @@ sub OrderByCols {
}
push @res, { %$row, ALIAS => $users, FIELD => $subkey };
} elsif ( defined $meta->[0] && $meta->[0] eq 'CUSTOMFIELD' ) {
- my ($queue, $field, $cf_obj, $column) = $self->_CustomFieldDecipher( $subkey );
- my $cfkey = $cf_obj ? $cf_obj->id : "$queue.$field";
- $cfkey .= ".ordering" if !$cf_obj || ($cf_obj->MaxValues||0) != 1;
- my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, ($cf_obj || $field) );
- # this is described in _CustomFieldLimit
- $self->Limit(
- ALIAS => $CFs,
- FIELD => 'Name',
- OPERATOR => 'IS NOT',
- VALUE => 'NULL',
- QUOTEVALUE => 1,
- ENTRYAGGREGATOR => 'AND',
- ) if $CFs;
- unless ($cf_obj) {
- # For those cases where we are doing a join against the
- # CF name, and don't have a CFid, use Unique to make sure
- # we don't show duplicate tickets. NOTE: I'm pretty sure
- # this will stay mixed in for the life of the
- # class/package, and not just for the life of the object.
- # Potential performance issue.
- require DBIx::SearchBuilder::Unique;
- DBIx::SearchBuilder::Unique->import;
- }
- my $CFvs = $self->Join(
- TYPE => 'LEFT',
- ALIAS1 => $TicketCFs,
- FIELD1 => 'CustomField',
- TABLE2 => 'CustomFieldValues',
- FIELD2 => 'CustomField',
- );
- $self->Limit(
- LEFTJOIN => $CFvs,
- FIELD => 'Name',
- QUOTEVALUE => 0,
- VALUE => $TicketCFs . ".Content",
- ENTRYAGGREGATOR => 'AND'
- );
-
- push @res, { %$row, ALIAS => $CFvs, FIELD => 'SortOrder' };
- push @res, { %$row, ALIAS => $TicketCFs, FIELD => 'Content' };
+ my ($queue, $field, $cf, $column) = $self->_CustomFieldDecipher( $subkey );
+ push @res, $self->_OrderByCF( $row, ($cf || "$queue.$field") );
} elsif ( $field eq "Custom" && $subkey eq "Ownership") {
# PAW logic is "reversed"
my $order = "ASC";
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list