update deprecation warning in Changes and fix to M::M::CDBI delete action

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@459 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index d1a3fb9ee19b76f50073be54ba02520f3b13ef7f..89e02e7a216a84eb4d49a365e1a189ad8c5966d3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -11,9 +11,8 @@ Deprecated:
 
 Incompatible API changes:
     Maypole:
-        - is_applicable() renamed to is_model_applicable(), and returns boolean 
-            instead of a status code. Old-style is_applicable() will still work, 
-            but issues a warning.
+        - is_applicable() deprecated for is_model_applicable(). is_applicable is
+         an alias for is_model_applicable now.        
     Maypole::Model
        - delete and search actions are now deprecated - use do_search and do_delete
          instead

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index da6f16224c69b0d4073be5e3be66f38918182640..3705331c8ec74de51de6f50ab4562591752bcc83 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -158,10 +158,14 @@ This method replaces the, now deprecated, delete method provided in prior versio
 sub delete : Exported {
   my $self = shift;
   my ($sub) = (caller(1))[3];
+  # So subclasses can still send delete down ...
   $sub =~ /^(.+)::([^:]+)$/;
-  # So subclasses can still send search down ...
-  return ($1 ne "Maypole::Model::Base" && $2 ne "delete") ?
-    $self->SUPER::search(@_) : $self->do_delete(@_);
+  if ($1 ne "Maypole::Model::Base" && $2 ne "delete") {
+    $self->SUPER::delete(@_);
+  } else {
+    warn "Maypole::Model::CDBI delete method is deprecated\n";
+    $self->do_delete(@_);
+  }
 }
 
 sub do_delete {