r26246 - in /branches/upstream/librose-db-perl/current: Changes META.yml Makefile.PL lib/Rose/DB.pm lib/Rose/DB/Oracle.pm t/rosedbrc t/setup.t
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Sun Oct 26 06:32:58 UTC 2008
Author: rmayorga-guest
Date: Sun Oct 26 06:32:55 2008
New Revision: 26246
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26246
Log:
[svn-upgrade] Integrating new upstream version, librose-db-perl (0.747)
Modified:
branches/upstream/librose-db-perl/current/Changes
branches/upstream/librose-db-perl/current/META.yml
branches/upstream/librose-db-perl/current/Makefile.PL
branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
branches/upstream/librose-db-perl/current/lib/Rose/DB/Oracle.pm
branches/upstream/librose-db-perl/current/t/rosedbrc
branches/upstream/librose-db-perl/current/t/setup.t
Modified: branches/upstream/librose-db-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/Changes?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/Changes (original)
+++ branches/upstream/librose-db-perl/current/Changes Sun Oct 26 06:32:55 2008
@@ -1,3 +1,12 @@
+0.747 (10.22.2008) - Justin Ellison <justin at techadvise.com>
+
+ * Changed to require YAML instead of YAML::Syck, though YAML::Syck
+ will be used in preference to YAML if it's present. (RT 31535)
+
+0.746 (09.16.2008) - Justin Ellison <justin at techadvise.com>
+
+ * Fixed support for TIMESTAMP WITH TIME ZONE column in Oracle.
+
0.745 (09.12.2008) - John Siracusa <siracusa at gmail.com>
* Added support for Oracle date/time column keywords.
Modified: branches/upstream/librose-db-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/META.yml?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/META.yml (original)
+++ branches/upstream/librose-db-perl/current/META.yml Sun Oct 26 06:32:55 2008
@@ -1,25 +1,36 @@
--- #YAML:1.0
-name: Rose-DB
-version: 0.745
-abstract: ~
-license: ~
-author: ~
-generated_by: ExtUtils::MakeMaker version 6.44
-distribution_type: module
-requires:
- Bit::Vector::Overload: 6.4
- Clone::PP: 0
- DateTime::Duration: 0
- DateTime::Format::MySQL: 0
- DateTime::Format::Pg: 0.11
- DBI: 0
- Rose::DateTime::Util: 0.532
- Rose::Object: 0.82
- Scalar::Util: 0
- SQL::ReservedWords: 0
- Test::More: 0
- Time::Clock: 0
- YAML::Syck: 0
+name: Rose-DB
+version: 0.747
+abstract: ~
+author: []
+license: perl
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ Bit::Vector::Overload: 6.4
+ Clone::PP: 0
+ DateTime::Duration: 0
+ DateTime::Format::MySQL: 0
+ DateTime::Format::Pg: 0.11
+ DBI: 0
+ Rose::DateTime::Util: 0.532
+ Rose::Object: 0.82
+ Scalar::Util: 0
+ SQL::ReservedWords: 0
+ Test::More: 0
+ Time::Clock: 0
+resources:
+ bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-DB
+ homepage: http://rose.googlecode.com/
+ license: http://dev.perl.org/licenses/
+ MailingList: http://groups.google.com/group/rose-db-object
+ repository: http://rose.googlecode.com/svn/trunk/modules/Rose-DB
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.47_02
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/librose-db-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/Makefile.PL?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/Makefile.PL (original)
+++ branches/upstream/librose-db-perl/current/Makefile.PL Sun Oct 26 06:32:55 2008
@@ -1,6 +1,14 @@
require 5.006;
use ExtUtils::MakeMaker;
+
+my $MM_Version = $ExtUtils::MakeMaker::VERSION;
+
+if($MM_Version =~ /_/) # dev version
+{
+ $MM_Version = eval $MM_Version;
+ die $@ if($@);
+}
WriteMakefile(NAME => 'Rose::DB',
PMLIBDIRS => [ 'lib' ],
@@ -20,7 +28,20 @@
'Rose::DateTime::Util' => 0.532,
'Time::Clock' => 0,
'SQL::ReservedWords' => 0,
- 'YAML::Syck' => 0,
'Scalar::Util' => 0,
},
- clean => { FILES => "t/*.db" });
+ clean => { FILES => "t/*.db" },
+ ($MM_Version >= 6.48 ? (MIN_PERL_VERSION => '5.6.0') : ()),
+ ($MM_Version >= 6.31 ? (LICENSE => 'perl') : ()),
+ ($MM_Version <= 6.44 ? () :
+ (META_MERGE =>
+ {
+ resources =>
+ {
+ license => 'http://dev.perl.org/licenses/',
+ homepage => 'http://rose.googlecode.com/',
+ bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-DB',
+ repository => 'http://rose.googlecode.com/svn/trunk/modules/Rose-DB',
+ MailingList => 'http://groups.google.com/group/rose-db-object',
+ },
+ })));
Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/lib/Rose/DB.pm?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB.pm Sun Oct 26 06:32:55 2008
@@ -20,7 +20,7 @@
our $Error;
-our $VERSION = '0.745';
+our $VERSION = '0.747';
our $Debug = 0;
@@ -2186,16 +2186,34 @@
# g3db:
# password: myothersecret
+our $YAML_Class;
+
sub load_yaml_fixup_file
{
my($class, $file) = @_;
my $registry = $class->registry;
- require YAML::Syck;
+ unless($YAML_Class)
+ {
+ eval { require YAML::Syck };
+
+ if($@)
+ {
+ require YAML;
+ #warn "# Using YAML\n";
+ $YAML_Class = 'YAML';
+ }
+ else
+ {
+ #warn "# Using YAML::Syck\n";
+ $YAML_Class = 'YAML::Syck';
+ }
+ }
$Debug && warn "$class - Loading fixups from $file...\n";
- my @data = YAML::Syck::LoadFile($file);
+ no strict 'refs';
+ my @data = &{"${YAML_Class}::LoadFile"}($file);
foreach my $data (@data)
{
@@ -2607,7 +2625,9 @@
The path to the fix-up file is determined by the C<ROSEDBRC> environment variable. If this variable is not set, or if the file it points to does not exist, then it defaults to C</etc/rosedbrc>.
-This file should be in YAML format with the following structure:
+This file should be in YAML format. To read this file, you must have either L<YAML::Syck> or some reasonably modern version of L<YAML> installed (0.66 or later recommended). L<YAML::Syck> will be preferred if both are installed.
+
+The C<ROSEDBRC> file's contents have the following structure:
---
somedomain:
Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB/Oracle.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/lib/Rose/DB/Oracle.pm?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB/Oracle.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB/Oracle.pm Sun Oct 26 06:32:55 2008
@@ -8,7 +8,7 @@
our $Debug = 0;
-our $VERSION = '0.745';
+our $VERSION = '0.746';
use Rose::Class::MakeMethods::Generic
(
@@ -19,7 +19,8 @@
(
[
q(ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'),
- q(ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF')
+ q(ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'),
+ q(ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SSxFF')
]
);
@@ -345,6 +346,7 @@
ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'
ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'
+ ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'
These statements enable date/time column value parsing and formatting to work correctly.
Modified: branches/upstream/librose-db-perl/current/t/rosedbrc
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/rosedbrc?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/rosedbrc (original)
+++ branches/upstream/librose-db-perl/current/t/rosedbrc Sun Oct 26 06:32:55 2008
@@ -6,4 +6,4 @@
otherdomain:
othertype:
host: othervalue
- port: 1234
+ port: 1234
Modified: branches/upstream/librose-db-perl/current/t/setup.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/setup.t?rev=26246&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/setup.t (original)
+++ branches/upstream/librose-db-perl/current/t/setup.t Sun Oct 26 06:32:55 2008
@@ -6,7 +6,18 @@
use lib "$Bin/lib";
-use Test::More tests => 4;
+use Test::More;
+
+eval { require YAML::Syck };
+
+if($@)
+{
+ eval { require YAML };
+
+ plan(skip_all => 'YAML or YAML::Syck required for setup tests') if($@);
+}
+
+Test::More->import(tests => 4);
$ENV{'ROSEDBRC'} = "$Bin/rosedbrc";
$ENV{'ROSEDB_DEVINIT'} = rand > 0.5 ? 'My::FixUp' : "$Bin/lib/My/FixUp.pm";
More information about the Pkg-perl-cvs-commits
mailing list