diff options
author | ivan <ivan> | 2007-12-01 01:33:35 +0000 |
---|---|---|
committer | ivan <ivan> | 2007-12-01 01:33:35 +0000 |
commit | d842371b1e41ae0204ffb8b0d788e9100e3a467d (patch) | |
tree | da64bdfbc1707f5173f683e32ca7ad2f6a173326 /FS/FS/h_Common.pm | |
parent | 0770f043ba43f47b76e65204248cfb67b044072f (diff) |
this doesn't actually have anything to do with cancellation persay, since its generic now
Diffstat (limited to 'FS/FS/h_Common.pm')
-rw-r--r-- | FS/FS/h_Common.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/FS/FS/h_Common.pm b/FS/FS/h_Common.pm index d9846ee..ca13e1b 100644 --- a/FS/FS/h_Common.pm +++ b/FS/FS/h_Common.pm @@ -33,7 +33,7 @@ inherit from. Returns an a list consisting of the "SELECT", "EXTRA_SQL", SQL fragments, a placeholder for "CACHE_OBJ" and an "AS" SQL fragment, to search for the appropriate history records created before END_TIMESTAMP and (optionally) not -cancelled before START_TIMESTAMP. +deleted before START_TIMESTAMP. =cut @@ -49,16 +49,16 @@ sub sql_h_search { confess 'Called sql_h_search without END_TIMESTAMP'; } - my( $notcancelled, $notcancelled_mr ) = ( '', '' ); + my( $notdeleted, $notdeleted_mr ) = ( '', '' ); if ( scalar(@_) && $_[0] ) { - $notcancelled = + $notdeleted = "AND 0 = ( SELECT COUNT(*) FROM $table as notdel WHERE notdel.$pkey = maintable.$pkey AND notdel.history_action = 'delete' AND notdel.history_date > maintable.history_date AND notdel.history_date <= $_[0] )"; - $notcancelled_mr = + $notdeleted_mr = "AND 0 = ( SELECT COUNT(*) FROM $table as notdel_mr WHERE notdel_mr.$pkey = mostrecent.$pkey AND notdel_mr.history_action = 'delete' @@ -75,7 +75,7 @@ sub sql_h_search { AND ( history_action = 'insert' OR history_action = 'replace_new' ) - $notcancelled + $notdeleted AND history_date = ( SELECT MAX(mostrecent.history_date) FROM $table AS mostrecent WHERE mostrecent.$pkey = maintable.$pkey @@ -83,7 +83,7 @@ sub sql_h_search { AND ( mostrecent.history_action = 'insert' OR mostrecent.history_action = 'replace_new' ) - $notcancelled_mr + $notdeleted_mr ) ORDER BY $pkey ASC", |