[Jifty-commit] jifty-dbi branch, master, updated. 0.68-3-g2f83aa6
Jifty commits
jifty-commit at lists.jifty.org
Mon Apr 25 10:45:52 EDT 2011
The branch, master has been updated
via 2f83aa6da76039cca8437bb9c131d4d65bbce4c9 (commit)
via 9412b2923717b2b13327d3c189b12713629fc115 (commit)
from 728bc3bc885c6a5dccce829088aeda684cafcbc8 (commit)
Summary of changes:
lib/Jifty/DBI/Collection.pm | 14 +++++++-------
lib/Jifty/DBI/Collection/Unique.pm | 2 +-
lib/Jifty/DBI/Filter.pm | 2 +-
lib/Jifty/DBI/Filter/Boolean.pm | 4 ++--
lib/Jifty/DBI/Filter/SaltHash.pm | 2 +-
lib/Jifty/DBI/Filter/base64.pm | 2 +-
lib/Jifty/DBI/Handle.pm | 6 +++---
lib/Jifty/DBI/Handle/Informix.pm | 4 ++--
lib/Jifty/DBI/Handle/ODBC.pm | 4 ++--
lib/Jifty/DBI/Handle/Oracle.pm | 4 ++--
lib/Jifty/DBI/Handle/Pg.pm | 4 ++--
lib/Jifty/DBI/Handle/SQLite.pm | 4 ++--
lib/Jifty/DBI/Handle/Sybase.pm | 4 ++--
lib/Jifty/DBI/Handle/mysql.pm | 4 ++--
lib/Jifty/DBI/Handle/mysqlPP.pm | 4 ++--
lib/Jifty/DBI/HasFilters.pm | 2 +-
lib/Jifty/DBI/Record.pm | 2 +-
lib/Jifty/DBI/Record/Cachable.pm | 2 +-
lib/Jifty/DBI/Record/Plugin.pm | 6 +++---
lib/Jifty/DBI/Schema.pm | 8 ++++----
lib/Jifty/DBI/SchemaGenerator.pm | 8 ++++----
t/01-version_checks.t | 4 ++--
t/01records.t | 4 ++--
t/02-column_constraints.t | 2 +-
t/02searches_distinct_values.t | 8 ++++----
t/06filter_base64.t | 2 +-
t/06filter_salthash.t | 2 +-
t/10schema.t | 8 ++++----
t/16inheritance.t | 2 +-
t/17virtualtypes.t | 4 ++--
30 files changed, 64 insertions(+), 64 deletions(-)
- Log -----------------------------------------------------------------
commit 9412b2923717b2b13327d3c189b12713629fc115
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Apr 25 22:34:53 2011 +0800
Revert "qw() is depreciated since 4.13.5"
actually, qw() is not deprecated unless as parentheses
This reverts commit 728bc3bc885c6a5dccce829088aeda684cafcbc8.
diff --git a/lib/Jifty/DBI/Collection.pm b/lib/Jifty/DBI/Collection.pm
index 8f43abe..3b9081e 100755
--- a/lib/Jifty/DBI/Collection.pm
+++ b/lib/Jifty/DBI/Collection.pm
@@ -62,7 +62,7 @@ name for the class -- see the L</SYNOPSIS> for an example.
=cut
-use vars qw/$VERSION/;
+use vars qw($VERSION);
use Data::Page;
use Clone;
@@ -149,7 +149,7 @@ sub clean_slate {
$self->{'alias_count'} = 0;
$self->{'first_row'} = 0;
- delete $self->{$_} for qw/
+ delete $self->{$_} for qw(
items
joins
raw_rows
@@ -158,7 +158,7 @@ sub clean_slate {
restrictions
_open_parens
criteria_count
- /;
+ );
$self->rows_per_page(0);
$self->implicit_clauses(%args);
@@ -1082,7 +1082,7 @@ it is asked for a record, it should re-execute the query.
sub redo_search {
my $self = shift;
$self->{'must_redo_search'} = 1;
- delete $self->{$_} for qw/items raw_rows count_all/;
+ delete $self->{$_} for qw(items raw_rows count_all);
$self->{'itemscount'} = 0;
}
@@ -1551,7 +1551,7 @@ sub _compile_generic_restrictions {
} else {
$result .= join ' ',
grep {defined}
- @{$entry}{qw/column operator value escape/};
+ @{$entry}{qw(column operator value escape)};
}
}
$result .= ')';
@@ -2276,11 +2276,11 @@ the list.
=cut
sub _cloned_attributes {
- return qw/
+ return qw(
joins
subclauses
restrictions
- /;
+ );
}
=head2 each CALLBACK
diff --git a/lib/Jifty/DBI/Collection/Unique.pm b/lib/Jifty/DBI/Collection/Unique.pm
index f5e0b52..eee8e33 100644
--- a/lib/Jifty/DBI/Collection/Unique.pm
+++ b/lib/Jifty/DBI/Collection/Unique.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use base 'Exporter';
-our @EXPORT = qw/AddRecord/;
+our @EXPORT = qw(AddRecord);
our $VERSION = "0.01";
=head2 add_record
diff --git a/lib/Jifty/DBI/Filter.pm b/lib/Jifty/DBI/Filter.pm
index 3727eeb..48a965c 100644
--- a/lib/Jifty/DBI/Filter.pm
+++ b/lib/Jifty/DBI/Filter.pm
@@ -4,7 +4,7 @@ use strict;
package Jifty::DBI::Filter;
use base 'Class::Accessor::Fast';
-__PACKAGE__->mk_accessors(qw/record column value_ref handle/);
+__PACKAGE__->mk_accessors(qw(record column value_ref handle));
=head1 NAME
diff --git a/lib/Jifty/DBI/Filter/Boolean.pm b/lib/Jifty/DBI/Filter/Boolean.pm
index 8f6da76..d7549f3 100644
--- a/lib/Jifty/DBI/Filter/Boolean.pm
+++ b/lib/Jifty/DBI/Filter/Boolean.pm
@@ -5,8 +5,8 @@ use strict;
use base 'Jifty::DBI::Filter';
-use constant TRUE_VALUES => qw/1 t true y yes TRUE/;
-use constant FALSE_VALUES => ('', qw/0 f false n no FALSE/);
+use constant TRUE_VALUES => qw(1 t true y yes TRUE);
+use constant FALSE_VALUES => ('', qw(0 f false n no FALSE));
sub _is_true {
my $self = shift;
diff --git a/lib/Jifty/DBI/Filter/SaltHash.pm b/lib/Jifty/DBI/Filter/SaltHash.pm
index b2fa3f2..1bbd139 100644
--- a/lib/Jifty/DBI/Filter/SaltHash.pm
+++ b/lib/Jifty/DBI/Filter/SaltHash.pm
@@ -4,7 +4,7 @@ use warnings;
use strict;
use base qw|Jifty::DBI::Filter|;
-use Digest::MD5 qw/md5_hex/;
+use Digest::MD5 qw(md5_hex);
=head1 NAME
diff --git a/lib/Jifty/DBI/Filter/base64.pm b/lib/Jifty/DBI/Filter/base64.pm
index 9910aec..7783456 100644
--- a/lib/Jifty/DBI/Filter/base64.pm
+++ b/lib/Jifty/DBI/Filter/base64.pm
@@ -4,7 +4,7 @@ use warnings;
use strict;
use base qw|Jifty::DBI::Filter|;
-use Encode qw/encode_utf8 is_utf8/;
+use Encode qw(encode_utf8 is_utf8);
use MIME::Base64 ();
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle.pm b/lib/Jifty/DBI/Handle.pm
index 6320c7e..a5c7cc6 100755
--- a/lib/Jifty/DBI/Handle.pm
+++ b/lib/Jifty/DBI/Handle.pm
@@ -7,7 +7,7 @@ use Encode ();
use base qw/Jifty::DBI::HasFilters/;
-use vars qw/%DBIHandle $PrevHandle $DEBUG $TRANSDEPTH/;
+use vars qw(%DBIHandle $PrevHandle $DEBUG $TRANSDEPTH);
$TRANSDEPTH = 0;
@@ -1347,7 +1347,7 @@ Returns a list of the drivers L<Jifty::DBI> supports.
=cut
sub supported_drivers {
- return qw/
+ return qw(
SQLite
Informix
mysql
@@ -1356,7 +1356,7 @@ sub supported_drivers {
Oracle
Pg
Sybase
- /;
+ );
}
=head2 available_drivers
diff --git a/lib/Jifty/DBI/Handle/Informix.pm b/lib/Jifty/DBI/Handle/Informix.pm
index 89bd05c..10e1ccf 100644
--- a/lib/Jifty/DBI/Handle/Informix.pm
+++ b/lib/Jifty/DBI/Handle/Informix.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::Informix;
use Jifty::DBI::Handle;
- at ISA = qw/Jifty::DBI::Handle/;
+ at ISA = qw(Jifty::DBI::Handle);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/ODBC.pm b/lib/Jifty/DBI/Handle/ODBC.pm
index 124c565..70cfccf 100644
--- a/lib/Jifty/DBI/Handle/ODBC.pm
+++ b/lib/Jifty/DBI/Handle/ODBC.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::ODBC;
use Jifty::DBI::Handle;
- at ISA = qw/Jifty::DBI::Handle/;
+ at ISA = qw(Jifty::DBI::Handle);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/Oracle.pm b/lib/Jifty/DBI/Handle/Oracle.pm
index 96ae368..2abba56 100755
--- a/lib/Jifty/DBI/Handle/Oracle.pm
+++ b/lib/Jifty/DBI/Handle/Oracle.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::Oracle;
use base qw/Jifty::DBI::Handle/;
-use DBD::Oracle qw/:ora_types ORA_OCI/;
+use DBD::Oracle qw(:ora_types ORA_OCI);
-use vars qw/$VERSION $DBIHandle $DEBUG/;
+use vars qw($VERSION $DBIHandle $DEBUG);
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/Pg.pm b/lib/Jifty/DBI/Handle/Pg.pm
index 7e39fb3..7b413eb 100755
--- a/lib/Jifty/DBI/Handle/Pg.pm
+++ b/lib/Jifty/DBI/Handle/Pg.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::Pg;
use strict;
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
-use base qw/Jifty::DBI::Handle/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
+use base qw(Jifty::DBI::Handle);
use strict;
diff --git a/lib/Jifty/DBI/Handle/SQLite.pm b/lib/Jifty/DBI/Handle/SQLite.pm
index 5454c06..53fe467 100644
--- a/lib/Jifty/DBI/Handle/SQLite.pm
+++ b/lib/Jifty/DBI/Handle/SQLite.pm
@@ -1,9 +1,9 @@
package Jifty::DBI::Handle::SQLite;
use Jifty::DBI::Handle;
- at ISA = qw/Jifty::DBI::Handle/;
+ at ISA = qw(Jifty::DBI::Handle);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/Sybase.pm b/lib/Jifty/DBI/Handle/Sybase.pm
index c313043..d2c7f86 100644
--- a/lib/Jifty/DBI/Handle/Sybase.pm
+++ b/lib/Jifty/DBI/Handle/Sybase.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::Sybase;
use Jifty::DBI::Handle;
- at ISA = qw/Jifty::DBI::Handle/;
+ at ISA = qw(Jifty::DBI::Handle);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/mysql.pm b/lib/Jifty/DBI/Handle/mysql.pm
index a41a58e..ee420c3 100755
--- a/lib/Jifty/DBI/Handle/mysql.pm
+++ b/lib/Jifty/DBI/Handle/mysql.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::mysql;
use Jifty::DBI::Handle;
- at ISA = qw/Jifty::DBI::Handle/;
+ at ISA = qw(Jifty::DBI::Handle);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
=head1 NAME
diff --git a/lib/Jifty/DBI/Handle/mysqlPP.pm b/lib/Jifty/DBI/Handle/mysqlPP.pm
index 252cef0..af74318 100644
--- a/lib/Jifty/DBI/Handle/mysqlPP.pm
+++ b/lib/Jifty/DBI/Handle/mysqlPP.pm
@@ -1,8 +1,8 @@
package Jifty::DBI::Handle::mysqlPP;
use Jifty::DBI::Handle::mysql;
- at ISA = qw/Jifty::DBI::Handle::mysql/;
+ at ISA = qw(Jifty::DBI::Handle::mysql);
-use vars qw/$VERSION @ISA $DBIHandle $DEBUG/;
+use vars qw($VERSION @ISA $DBIHandle $DEBUG);
use strict;
1;
diff --git a/lib/Jifty/DBI/HasFilters.pm b/lib/Jifty/DBI/HasFilters.pm
index d1e427e..34613fb 100644
--- a/lib/Jifty/DBI/HasFilters.pm
+++ b/lib/Jifty/DBI/HasFilters.pm
@@ -4,7 +4,11 @@ use warnings;
use strict;
use base qw/Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors( qw/input_filters output_filters filters/ );
+__PACKAGE__->mk_accessors qw/
+ input_filters
+ output_filters
+ filters
+ /;
=head1 NAME
diff --git a/lib/Jifty/DBI/Record.pm b/lib/Jifty/DBI/Record.pm
index d0277e9..e3e046d 100755
--- a/lib/Jifty/DBI/Record.pm
+++ b/lib/Jifty/DBI/Record.pm
@@ -7,7 +7,7 @@ use Class::ReturnValue ();
use Lingua::EN::Inflect ();
use Jifty::DBI::Column ();
use UNIVERSAL::require ();
-use Scalar::Util qw/blessed/;
+use Scalar::Util qw(blessed);
use Class::Trigger; # exports by default
use Scalar::Defer 'force';
diff --git a/lib/Jifty/DBI/Record/Cachable.pm b/lib/Jifty/DBI/Record/Cachable.pm
index ff7692e..8c77654 100755
--- a/lib/Jifty/DBI/Record/Cachable.pm
+++ b/lib/Jifty/DBI/Record/Cachable.pm
@@ -1,6 +1,6 @@
package Jifty::DBI::Record::Cachable;
-use base qw/Jifty::DBI::Record/;
+use base qw(Jifty::DBI::Record);
use Jifty::DBI::Handle;
diff --git a/lib/Jifty/DBI/Record/Plugin.pm b/lib/Jifty/DBI/Record/Plugin.pm
index 1fbe9e7..ca59e2e 100644
--- a/lib/Jifty/DBI/Record/Plugin.pm
+++ b/lib/Jifty/DBI/Record/Plugin.pm
@@ -16,9 +16,9 @@ Jifty::DBI::Record::Plugin - Record model mixins for Jifty::DBI
use base qw/ Jifty::DBI::Record::Plugin /;
# Define which methods you want to put in the host model
- our @EXPORT = qw/
+ our @EXPORT = qw(
favorite_complementary_color
- /;
+ );
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
@@ -90,7 +90,7 @@ To build a mixin, just create a model that inherits from this package, C<Jifty::
A mixin may define an C<@EXPORT> variable, which works exactly as advertised in L<Exporter>. That is, given the name of any methods or variable names in the mixin, the host model will gain those methods.
- our @EXPORT = qw/ autocomplete_swallow_type /;
+ our @EXPORT = qw( autocomplete_swallow_type );
sub autocomplete_swallow_type {
my $self = shift;
diff --git a/lib/Jifty/DBI/Schema.pm b/lib/Jifty/DBI/Schema.pm
index 4e057be..1d47c31 100644
--- a/lib/Jifty/DBI/Schema.pm
+++ b/lib/Jifty/DBI/Schema.pm
@@ -50,7 +50,7 @@ See L<Scalar::Defer> for more information about C<defer>.
use Carp qw/croak carp/;
use Scalar::Defer;
-use base qw/Class::Data::Inheritable/;
+use base qw(Class::Data::Inheritable);
__PACKAGE__->mk_classdata('TYPES' => {});
use Object::Declare (
@@ -84,7 +84,7 @@ use Object::Declare (
use Class::Data::Inheritable;
use UNIVERSAL::require ();
-our @EXPORT = qw/ defer lazy column schema by render_as since till literal/;
+our @EXPORT = qw( defer lazy column schema by render_as since till literal);
sub by ($) { @_ }
sub render_as ($) { render as @_ }
@@ -105,7 +105,7 @@ use Exporter::Lite ();
my $old_sig_die;
sub import {
- no warnings qw/ uninitialized numeric /;
+ no warnings qw( uninitialized numeric );
$old_sig_die ||= $SIG{__DIE__};
$SIG{__DIE__} = \&filter_die unless $SIG{__DIE__} and $SIG{__DIE__} == \&filter_die;
@@ -437,7 +437,7 @@ __PACKAGE__->register_types(
boolean => sub {
encode_on_select is 1,
type is 'boolean',
- filters are qw/Jifty::DBI::Filter::Boolean/,
+ filters are qw(Jifty::DBI::Filter::Boolean),
default is 'false',
render_as 'Checkbox',
_init_handler is sub {
diff --git a/lib/Jifty/DBI/SchemaGenerator.pm b/lib/Jifty/DBI/SchemaGenerator.pm
index 9619cf1..016b97a 100644
--- a/lib/Jifty/DBI/SchemaGenerator.pm
+++ b/lib/Jifty/DBI/SchemaGenerator.pm
@@ -3,7 +3,7 @@ use warnings;
package Jifty::DBI::SchemaGenerator;
-use base qw/Class::Accessor::Fast/;
+use base qw(Class::Accessor::Fast);
use DBIx::DBSchema;
use DBIx::DBSchema::Column;
use DBIx::DBSchema::Table;
@@ -13,10 +13,10 @@ use version;
our $VERSION = '0.01';
# Public accessors
-__PACKAGE__->mk_accessors(qw/handle/);
+__PACKAGE__->mk_accessors(qw(handle));
# Internal accessors: do not use from outside class
-__PACKAGE__->mk_accessors(qw/_db_schema/);
+__PACKAGE__->mk_accessors(qw(_db_schema));
=head1 NAME
@@ -57,7 +57,7 @@ See L<Jifty::DBI> for details about the first two parts.
use warnings;
use strict;
- use base qw/Jifty::DBI::Record/;
+ use base qw(Jifty::DBI::Record);
# your custom code goes here.
1;
diff --git a/t/01-version_checks.t b/t/01-version_checks.t
index f42ccbd..912716e 100644
--- a/t/01-version_checks.t
+++ b/t/01-version_checks.t
@@ -1,13 +1,13 @@
#!/usr/bin/env perl -w
use strict;
-use Test::More qw/no_plan/;
+use Test::More qw(no_plan);
# by Eric Wilhelm in response to Randal Schwartz pointing out that
# CPAN.pm chokes on the VERSION >... construct
# I dare not mention it here.
use ExtUtils::MakeMaker;
-use ExtUtils::Manifest qw/maniread/;
+use ExtUtils::Manifest qw(maniread);
use_ok('Jifty::DBI');
my $minfo = maniread();
diff --git a/t/01records.t b/t/01records.t
index 5d55157..3d23c80 100644
--- a/t/01records.t
+++ b/t/01records.t
@@ -38,8 +38,8 @@ SKIP: {
is( $rec->_accessible('id' => 'write'), 0, 'id is not accessible for write' );
is( $rec->_accessible('id'), undef, "any column is not accessible in undefined mode" );
is( $rec->_accessible('unexpected_column' => 'read'), undef, "column doesn't exist and can't be accessible for read" );
- is_deeply( [sort($rec->readable_attributes)], [sort qw/address employee_id id name phone/], 'readable attributes' );
- is_deeply( [sort($rec->writable_attributes)], [sort qw/address employee_id name phone/], 'writable attributes' );
+ is_deeply( [sort($rec->readable_attributes)], [sort qw(address employee_id id name phone)], 'readable attributes' );
+ is_deeply( [sort($rec->writable_attributes)], [sort qw(address employee_id name phone)], 'writable attributes' );
can_ok($rec,'create');
diff --git a/t/02-column_constraints.t b/t/02-column_constraints.t
index cb96274..071a652 100644
--- a/t/02-column_constraints.t
+++ b/t/02-column_constraints.t
@@ -4,7 +4,7 @@
use strict;
use warnings;
use File::Spec;
-use Test::More;# import => [qw/isa_ok skip plan/];
+use Test::More;# import => [qw(isa_ok skip plan)];
use Test::Warn;
BEGIN { require "t/utils.pl" }
diff --git a/t/02searches_distinct_values.t b/t/02searches_distinct_values.t
index a29ba65..a961f28 100644
--- a/t/02searches_distinct_values.t
+++ b/t/02searches_distinct_values.t
@@ -45,22 +45,22 @@ diag "distinct_column_values on clean" if $ENV{'TEST_VERBOSE'};
{
is_deeply(
[sort $users_obj->distinct_column_values('country')],
- [qw/br ru us/],
+ [qw(br ru us)],
"full on non limitted collection"
);
is_deeply(
[$users_obj->distinct_column_values('country', sort => 'asc')],
- [qw/br ru us/],
+ [qw(br ru us)],
"sorting in DB"
);
is_deeply(
[$users_obj->distinct_column_values('country', sort => 'desc')],
- [qw/us ru br/],
+ [qw(us ru br)],
"reverse sorting in DB"
);
is_deeply(
[$users_obj->distinct_column_values('country', sort => 'desc', max => 2)],
- [qw/us ru/],
+ [qw(us ru)],
"sorting and limitted"
);
}
diff --git a/t/06filter_base64.t b/t/06filter_base64.t
index b368ca0..93590f4 100644
--- a/t/06filter_base64.t
+++ b/t/06filter_base64.t
@@ -2,7 +2,7 @@
use strict;
use warnings;
-use Encode qw/decode_utf8 is_utf8/;
+use Encode qw(decode_utf8 is_utf8);
use Test::More;
BEGIN { require "t/utils.pl" }
diff --git a/t/06filter_salthash.t b/t/06filter_salthash.t
index 2a4c7c7..76b4785 100644
--- a/t/06filter_salthash.t
+++ b/t/06filter_salthash.t
@@ -3,7 +3,7 @@ use strict;
use warnings;
use Test::More;
-use Digest::MD5 qw/ md5_hex /;
+use Digest::MD5 qw( md5_hex );
BEGIN { require "t/utils.pl" }
our (@available_drivers);
diff --git a/t/10schema.t b/t/10schema.t
index 898488e..eb5efaf 100644
--- a/t/10schema.t
+++ b/t/10schema.t
@@ -78,7 +78,7 @@ foreach my $d ( @available_drivers ) {
my $employee = Sample::Employee->new;
isa_ok($employee, 'Sample::Employee');
- can_ok($employee, qw/ label type dexterity age /);
+ can_ok($employee, qw( label type dexterity age ));
$ret = $SG->add_model($employee);
@@ -91,7 +91,7 @@ foreach my $d ( @available_drivers ) {
my $corporation = Sample::Corporation->new;
isa_ok($corporation, 'Sample::Corporation');
- can_ok($corporation, qw/ name /);
+ can_ok($corporation, qw( name ));
$ret = $SG->add_model($corporation);
@@ -135,8 +135,8 @@ foreach my $d ( @available_drivers ) {
# employee_id shows up twice when we map over name because employee
# is automagically injected as an aliased column
- is_deeply([map { $_->name } Sample::Address->all_columns], [qw/id employee_id employee_id name phone street/], "got all columns");
- is_deeply([map { $_->name } Sample::Address->columns], [qw/id employee_id employee_id name phone/, ($street_added ? qw/street/ : ())], "got all active columns");
+ is_deeply([map { $_->name } Sample::Address->all_columns], [qw(id employee_id employee_id name phone street)], "got all columns");
+ is_deeply([map { $_->name } Sample::Address->columns], [qw(id employee_id employee_id name phone), ($street_added ? qw(street) : ())], "got all active columns");
my $address_version_schema = $street_added ? "${address_schema}_024"
: $address_schema;
diff --git a/t/16inheritance.t b/t/16inheritance.t
index 6a6ff0d..3c31f35 100644
--- a/t/16inheritance.t
+++ b/t/16inheritance.t
@@ -131,7 +131,7 @@ use Jifty::DBI::Record schema {
package TestApp::CrazyUser;
BEGIN {
-our @ISA =qw/TestApp::User/;
+our @ISA =qw(TestApp::User);
}
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
diff --git a/t/17virtualtypes.t b/t/17virtualtypes.t
index 61910b8..475569e 100644
--- a/t/17virtualtypes.t
+++ b/t/17virtualtypes.t
@@ -88,7 +88,7 @@ sub geolocation {
my ($column, $from) = @_;
my $name = $column->name;
$column->virtual(1);
- for (qw/x y/) {
+ for (qw(x y)) {
Jifty::DBI::Schema::_init_column_for(
Jifty::DBI::Column->new({ type => 'double',
name => $name."_$_",
@@ -97,7 +97,7 @@ sub geolocation {
$from);
}
no strict 'refs';
- *{$from.'::'.$name} = sub { return { map { my $method = "${name}_$_"; $_ => $_[0]->$method } qw/x y/ } };
+ *{$from.'::'.$name} = sub { return { map { my $method = "${name}_$_"; $_ => $_[0]->$method } qw(x y) } };
*{$from.'::'.'set_'.$name} = sub { die "not yet" };
}
commit 2f83aa6da76039cca8437bb9c131d4d65bbce4c9
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Apr 25 22:36:46 2011 +0800
qw() as parenthese is deprecated in 5.13.5
diff --git a/lib/Jifty/DBI/HasFilters.pm b/lib/Jifty/DBI/HasFilters.pm
index 34613fb..140b186 100644
--- a/lib/Jifty/DBI/HasFilters.pm
+++ b/lib/Jifty/DBI/HasFilters.pm
@@ -4,11 +4,7 @@ use warnings;
use strict;
use base qw/Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors qw/
- input_filters
- output_filters
- filters
- /;
+__PACKAGE__->mk_accessors(qw/ input_filters output_filters filters /);
=head1 NAME
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list