From c9860506278274605e76c1a8c18084db134d7409 Mon Sep 17 00:00:00 2001
From: "C.J. Adams-Collier" <cjac@colliertech.org>
Date: Mon, 8 Sep 2014 14:14:20 -0700
Subject: moved WHERE/AND logic in to calling code.  FS RT #884

---
 FS/FS/Record.pm | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'FS/FS/Record.pm')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 1b7ac8a..c53c9ae 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -402,26 +402,7 @@ sub qsearch {
         get_real_fields($table, $record, \@real_fields));
     }
 
-    if( defined($extra_sql) ){
-      if( $statement =~ /\sWHERE\s/i ){
-	if( $extra_sql =~ /^\s*AND /i ){
-	  # correct format
-	}elsif($extra_sql =~ /^\s*WHERE /i ){
-	  $extra_sql =~ s/WHERE /AND /i;
-	}else{
-	  $extra_sql = " AND $extra_sql";
-	}
-      }else{
-	if( $extra_sql =~ /^\s*AND /i ){
-	  $extra_sql =~ s/AND /WHERE /i;
-	}elsif($extra_sql =~ /^\s*WHERE /i ){
-	  # correct format
-	}else{
-	  $extra_sql = " WHERE $extra_sql";
-	}
-      }
-      $statement .= " $extra_sql";
-    }
+    $statement .= " $extra_sql" if defined($extra_sql);
     $statement .= " $order_by"  if defined($order_by);
 
     push @statement, $statement;
-- 
cgit v1.1