From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 7 Aug 2009 08:48:41 +0000 (+0000)
Subject: Merge 'trunk' into 'discard_changes_replication_fix'
X-Git-Tag: v0.08109~35^2~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=3a443bb0f22848133b6dba3661448cabec1a5b80

Merge 'trunk' into 'discard_changes_replication_fix'

r7236@Thesaurus (orig r7233):  caelum | 2009-08-05 19:49:51 +0200
fix rounding issues in mssql money tests
r7237@Thesaurus (orig r7234):  caelum | 2009-08-05 20:09:03 +0200
better money value comparison in tests
r7239@Thesaurus (orig r7236):  frew | 2009-08-05 20:53:32 +0200
whitespace jfklds;ajfklds;a
r7240@Thesaurus (orig r7237):  frew | 2009-08-05 20:54:41 +0200
Fix testing bug.  Windows only.
---

3a443bb0f22848133b6dba3661448cabec1a5b80
diff --cc t/93storage_replication.t
index 53e9fc9,9b6f1bf..45b59c5
--- a/t/93storage_replication.t
+++ b/t/93storage_replication.t
@@@ -755,30 -756,16 +756,30 @@@ is $debug{storage_type}, 'REPLICANT', "
  ## Test Discard changes
  
  {
- 	ok my $artist = $replicated->schema->resultset('Artist')->find(2)
- 	    => 'got an artist to test discard changes';
+     ok my $artist = $replicated->schema->resultset('Artist')->find(2)
+         => 'got an artist to test discard changes';
  
- 	is $debug{storage_type}, 'REPLICANT', "got last query from a replicant: $debug{dsn}";
+     is $debug{storage_type}, 'REPLICANT', "got last query from a replicant: $debug{dsn}";
  
- 	ok $artist->get_from_storage({force_pool=>'master'})
- 	   => 'properly called get_from_storage against master (manual attrs)';
+     ok $artist->get_from_storage({force_pool=>'master'})
+        => 'properly discard changes';
  
- 	is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
+     is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
  
- 	ok $artist->discard_changes({force_pool=>'master'})
- 	   => 'properly called discard_changes against master (manual attrs)';
++    ok $artist->discard_changes({force_pool=>'master'})
++       => 'properly called discard_changes against master (manual attrs)';
 +
- 	is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
++    is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
 +
- 	ok $artist->discard_changes()
- 	   => 'properly called discard_changes against master (default attrs)';
++    ok $artist->discard_changes()
++       => 'properly called discard_changes against master (default attrs)';
 +
- 	is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
++    is $debug{storage_type}, 'MASTER', "got last query from a master: $debug{dsn}";
 +
- 	ok $artist->discard_changes({force_pool=>$replicant_names[0]})
- 	   => 'properly able to override the default attributes';
++    ok $artist->discard_changes({force_pool=>$replicant_names[0]})
++       => 'properly able to override the default attributes';
 +
- 	is $debug{storage_type}, 'REPLICANT', "got last query from a replicant: $debug{dsn}"
++    is $debug{storage_type}, 'REPLICANT', "got last query from a replicant: $debug{dsn}"
  }
  
  ## Test some edge cases, like trying to do a transaction inside a transaction, etc