[Jifty-commit] jifty branch, setupwizard-refactor, updated. 72d8d021afb6823df85fda52e4a9022a8d7a3b3c

[Jifty commits]

The branch, setupwizard-refactor has been updated
       via  72d8d021afb6823df85fda52e4a9022a8d7a3b3c (commit)
      from  4b74fe610bdb2d3e9ae05ca7e6974359f30eeece (commit)

Summary of changes:
 lib/Jifty/Schema.pm |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 72d8d021afb6823df85fda52e4a9022a8d7a3b3c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jul 8 14:03:48 2010 -0400

    Fix faulty conditional that broke DB create/drop

diff --git a/lib/Jifty/Schema.pm b/lib/Jifty/Schema.pm
index 1c9c275..7be1e04 100644
--- a/lib/Jifty/Schema.pm
+++ b/lib/Jifty/Schema.pm
@@ -166,7 +166,7 @@ sub setup_minimal_environment {
         unless Jifty->class_loader;
 }
 
-=head2 probe_database_existence [NO_HANDLE]
+=head2 probe_database_existence
 
 Probes our database to see if it exists and is up to date.  This sets various
 L</flags> for later use.
@@ -174,9 +174,6 @@ L</flags> for later use.
 If AutoUpgrade is true in the application's config, this may cause the
 database to be automatically upgraded.
 
-Optionally takes a boolean to indicate whether or not we should bother to try
-to create an actual database handle.
-
 =cut
 
 sub probe_database_existence {
@@ -241,8 +238,8 @@ Dies with an error message if the database drop or create fails.
 sub manage_database_existence {
     my $self = shift;
 
-    return if not $self->flags->{'drop_database'}
-           or not $self->flags->{'create_database'};
+    return if not (   $self->flags->{'drop_database'}
+                   or $self->flags->{'create_database'} );
 
     my $handle = $self->connect_to_db_for_management();
 

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