minor changes

gravattj · Nov 29, 2014 · 2cdfa7e · 2cdfa7e
1 parent 516697f
commit 2cdfa7e
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 31 deletions.
diff --git a/lib/MySQL/Util.pm b/lib/MySQL/Util.pm
@@ -225,8 +225,9 @@ has '_verbose_funcs' => (
 sub BUILD {
 	my $self = shift;
 
+	# uncoverable branch true
 	if ( $ENV{VERBOSE} ) {
-		$self->_config_verbose_funcs();
+		$self->_config_verbose_funcs(); # uncoverable statement
 	}
 
 	my $netrc_error;
@@ -674,25 +675,26 @@ sub drop_table {
 	return 1;
 }
 
-=item drop_temp_table($table)
-
-Drops the specified temporary table.
-
-=cut
-
-sub drop_temp_table {
-	args_pos
-
-	  # required
-	  my $self  => 'Object',
-	  my $table => 'Str';
-
-	my $sql = "drop temporary table $table";
-	$self->_verbose($sql);
-	$self->_dbh->do($sql);
-
-	return 1;
-}
+#=item drop_temp_table($table)
+#
+#Drops the specified temporary table.
+#
+#=cut
+#
+#sub drop_temp_table {
+#	args_pos
+#
+#	  # required
+#	  my $self  => 'Object',
+#	  my $table => 'Str';
+#
+#
+#	my $sql = "drop temporary table $table";
+#	$self->_verbose($sql);
+#	$self->_dbh->do($sql);
+#
+#	return 1;
+#}
 
 =item dump_table($table);
 

diff --git a/lib/MySQL/Util/Protected.pm b/lib/MySQL/Util/Protected.pm
@@ -66,7 +66,7 @@ sub _drop_temp_table {
 	my $href = $self->_temp_tables;
 
 	if ( $href->{$table} ) {
-		$self->drop_temp_table($table);
+		$self->_dbh->do("drop temporary table $table");
 		delete $href->{$table};
 		return 1;
 	}

diff --git a/t/01-module-prereq.t b/t/01-module-prereq.t
@@ -4,5 +4,6 @@ use Test::More;
 eval "use Test::Prereq";
 
 plan skip_all => "Test::Prereq required to test dependencies" if $@;
+plan skip_all => "skipping prereq checks" if $ENV{SKIP_PREREQ};
 
 prereq_ok();
diff --git a/t/03-main.t b/t/03-main.t
@@ -4,6 +4,7 @@ use Modern::Perl;
 use lib 't/lib', './lib';
 use File::Copy;
 use Test::More 'no_plan';
+use Carp::Always;
 use MySQL::Util::Test::Common qw(get_mysql_util load_db get_host);
 use MySQL::Util::Test::New;
 use MySQL::Util::Test::GetAnyUniqConstraint;

diff --git a/t/lib/MySQL/Util/Test/GetAnyUniqConstraint.pm b/t/lib/MySQL/Util/Test/GetAnyUniqConstraint.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/env perl
-
 package MySQL::Util::Test::GetAnyUniqConstraint;
 
 use Modern::Perl;

diff --git a/t/lib/MySQL/Util/Test/GetColumns.pm b/t/lib/MySQL/Util/Test/GetColumns.pm
@@ -1,5 +1,3 @@
-#!/usr/bin/env perl
-
 package MySQL::Util::Test::GetColumns;
 
 use Modern::Perl;

diff --git a/t/lib/MySQL/Util/Test/IsFkConstraint.pm b/t/lib/MySQL/Util/Test/IsFkConstraint.pm
@@ -15,13 +15,31 @@ sub run {
 	my $self = shift;
 
 	my $util = $self->{util};
+
+	my $fk =
+	  $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	my $orig_on_upd = $fk->[0]->{UPDATE_RULE};
+	my $orig_on_del = $fk->[0]->{DELETE_RULE};
 
-	ok(
-		!$util->is_fk_constraint(
-								  table   => 'table_b',
-								  fk_name => 'PRIMARY'
-		)
+	my $undo_ddl = $util->set_fk_rules(
+										table     => 'depth_3a',
+										fk_name   => 'depth_3a_fk',
+										on_delete => 'CASCADE',
+										on_update => 'CASCADE'
 	);
+	ok($undo_ddl);
+
+	$fk = $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	my $col_href = shift @$fk;
+	ok( $col_href->{UPDATE_RULE} eq 'CASCADE' );
+	ok( $col_href->{DELETE_RULE} eq 'CASCADE' );
+
+	ok( $util->apply_ddl($undo_ddl) );
+
+	$fk = $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	$col_href = shift @$fk;
+	ok( $col_href->{UPDATE_RULE} eq $orig_on_upd );
+	ok( $col_href->{DELETE_RULE} eq $orig_on_del );
 }
 
 sub new {

diff --git a/t/lib/MySQL/Util/Test/TempTableExists.pm b/t/lib/MySQL/Util/Test/TempTableExists.pm
@@ -15,8 +15,31 @@ sub run {
 	my $self = shift;
 
 	my $util = $self->{util};
+
+	my $fk =
+	  $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	my $orig_on_upd = $fk->[0]->{UPDATE_RULE};
+	my $orig_on_del = $fk->[0]->{DELETE_RULE};
 
-	ok(! $util->temp_table_exists('bogus') );
+	my $undo_ddl = $util->set_fk_rules(
+										table     => 'depth_3a',
+										fk_name   => 'depth_3a_fk',
+										on_delete => 'CASCADE',
+										on_update => 'CASCADE'
+	);
+	ok($undo_ddl);
+
+	$fk = $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	my $col_href = shift @$fk;
+	ok( $col_href->{UPDATE_RULE} eq 'CASCADE' );
+	ok( $col_href->{DELETE_RULE} eq 'CASCADE' );
+
+	ok( $util->apply_ddl($undo_ddl) );
+
+	$fk = $util->get_constraint( table => 'depth_3a', name => 'depth_3a_fk' );
+	$col_href = shift @$fk;
+	ok( $col_href->{UPDATE_RULE} eq $orig_on_upd );
+	ok( $col_href->{DELETE_RULE} eq $orig_on_del );
 }
 
 sub new {