From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 10 Jan 2010 16:01:24 +0000 (+0000)
Subject: rename as per mst
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=69a8b315d5a09be123ac7c8a8a1906acd98f6eab;p=dbsrgits%2FDBIx-Class-Historic.git

rename as per mst
---

diff --git a/lib/DBIx/Class/Storage/DBI/MSSQL.pm b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
index 1893c66..3ce11e6 100644
--- a/lib/DBIx/Class/Storage/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
@@ -193,7 +193,7 @@ sub _select_args_to_query {
   if ( scalar $self->sql_maker->_order_by_chunks ($attrs->{order_by}) ) {
     $self->throw_exception(
       'An ordered subselect encountered - this is not safe! Please see "Ordered Subselects" in DBIx::Class::Storage::DBI::MSSQL
-    ') unless $attrs->{unsafe_subselect};
+    ') unless $attrs->{unsafe_subselect_ok};
     my $max = 2 ** 32;
     $sql =~ s/^ \s* SELECT \s/SELECT TOP $max /xi;
   }
@@ -339,13 +339,13 @@ rare. The benefits of ordered subselects are on the other hand too great to be
 outright disabled for MSSQL.
 
 Thus compromise between usability and perfection is the MSSQL-specific
-L<resultset attribute|DBIx::Class::ResultSet/ATTRIBUTES> C<unsafe_subselect>.
+L<resultset attribute|DBIx::Class::ResultSet/ATTRIBUTES> C<unsafe_subselect_ok>.
 It is deliberately not possible to set this on the Storage level, as the user
 should inspect (and preferrably regression-test) the return of every such
 ResultSet individually. The example above would work if written like:
 
  $rs->search ({}, {
-  unsafe_subselect => 1,
+  unsafe_subselect_ok => 1,
   prefetch => 'relation',
   rows => 2,
   offset => 3,
diff --git a/t/746mssql.t b/t/746mssql.t
index e70a3b8..a73bfea 100644
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -262,7 +262,7 @@ throws_ok (sub {
 
 # make sure ordered subselects *somewhat* work
 {
-  my $owners = $schema->resultset ('Owners')->search ({}, { order_by => 'name', offset => 2, rows => 3, unsafe_subselect => 1 });
+  my $owners = $schema->resultset ('Owners')->search ({}, { order_by => 'name', offset => 2, rows => 3, unsafe_subselect_ok => 1 });
 
   my $al = $owners->current_source_alias;
   my $sealed_owners = $owners->result_source->resultset->search (
@@ -288,7 +288,7 @@ TODO: {
   local $TODO = "This porbably will never work, but it isn't critical either afaik";
 
   my $book_owner_ids = $schema->resultset ('BooksInLibrary')
-                               ->search ({}, { join => 'owner', distinct => 1, order_by => 'owner.name', unsafe_subselect => 1 })
+                               ->search ({}, { join => 'owner', distinct => 1, order_by => 'owner.name', unsafe_subselect_ok => 1 })
                                 ->get_column ('owner');
 
   my $book_owners = $schema->resultset ('Owners')->search ({
@@ -304,7 +304,7 @@ TODO: {
 
 # This is known not to work - thus the negative test
 {
-  my $owners = $schema->resultset ('Owners')->search ({}, { order_by => 'name', offset => 2, rows => 3, unsafe_subselect => 1 });
+  my $owners = $schema->resultset ('Owners')->search ({}, { order_by => 'name', offset => 2, rows => 3, unsafe_subselect_ok => 1 });
   my $corelated_owners = $owners->result_source->resultset->search (
     {
       id => { -in => $owners->get_column('id')->as_query },
@@ -351,7 +351,7 @@ TODO: {
     'Rows were properly ordered'
   );
 
-  my $limited_rs = $rs->search ({}, {rows => 7, offset => 2, unsafe_subselect => 1});
+  my $limited_rs = $rs->search ({}, {rows => 7, offset => 2, unsafe_subselect_ok => 1});
   is ($limited_rs->count, 6, 'Correct count of limited right-sorted joined resultset');
   is ($limited_rs->count_rs->next, 6, 'Correct count_rs of limited right-sorted joined resultset');
 
@@ -397,7 +397,7 @@ $schema->storage->_sql_maker->{name_sep} = '.';
       prefetch => 'books',
       order_by => { -asc => \['name + ?', [ test => 'xxx' ]] }, # test bindvar propagation
       rows     => 3,  # 8 results total
-      unsafe_subselect => 1,
+      unsafe_subselect_ok => 1,
     },
   );
 
@@ -426,7 +426,7 @@ $schema->storage->_sql_maker->{name_sep} = '.';
       prefetch => 'owner',
       rows     => 2,  # 3 results total
       order_by => { -desc => 'owner' },
-      unsafe_subselect => 1,
+      unsafe_subselect_ok => 1,
     },
   );