[Rt-commit] rt branch, master, updated. rt-4.2.12-349-gb999e40

[Shawn Moore]

The branch, master has been updated
       via  b999e40e1dff508a01e146e88baa042459c6437d (commit)
      from  777d20044becbd214282cb52a3f46aa49a465626 (commit)

Summary of changes:
 lib/RT/SearchBuilder.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit b999e40e1dff508a01e146e88baa042459c6437d
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Oct 28 21:01:50 2015 +0000

    Reinstate searchbuilder column deprecation warnings, but for 4.6

diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 6987990..3065082 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -870,10 +870,6 @@ my %check_case_sensitivity = (
 );
 
 my %deprecated = (
-    groups => {
-        type => 'Name',
-    },
-    principals => { objectid => 'id' },
 );
 
 sub Limit {
@@ -914,6 +910,13 @@ sub Limit {
         : $self->Table
     ;
 
+    if ( $table and $ARGS{FIELD} and my $instead = $deprecated{ lc $table }{ lc
+        RT->Deprecated(
+            Message => "$table.$ARGS{'FIELD'} column is deprecated",
+            Instead => $instead, Remove => '4.6'
+        );
+    }
+
     unless ( exists $ARGS{CASESENSITIVE} or (exists $ARGS{QUOTEVALUE} and not $ARGS{QUOTEVALUE}) ) {
         if ( $ARGS{FIELD} and $ARGS{'OPERATOR'} !~ /IS/i
             && $table && $check_case_sensitivity{ lc $table }{ lc $ARGS{'FIELD'} }

-----------------------------------------------------------------------