[libdbd-firebird-perl] 01/01: Imported Upstream version 1.13
Damyan Ivanov
dmn at moszumanska.debian.org
Thu Jan 9 13:18:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
dmn pushed a commit to annotated tag upstream/1.13
in repository libdbd-firebird-perl.
commit c8aed8099d8bd1ff51afd223bb0be64db4d6f565
Author: Damyan Ivanov <dmn at debian.org>
Date: Mon Sep 9 12:59:00 2013 +0000
Imported Upstream version 1.13
---
Changes | 5 +++++
Firebird.pm | 4 ++--
MANIFEST | 4 +++-
META.json | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
META.yml | 47 +++++++++++++++++++++++------------------------
Makefile.PL | 1 +
README | 4 ++--
fb_init | 0
inc/FirebirdMaker.pm | 10 +++++-----
t/75-utf8.t | 4 ++--
t/80-event-ithreads.t | 16 ++++++++++++++--
t/TestFirebird.pm | 2 +-
12 files changed, 107 insertions(+), 39 deletions(-)
diff --git a/Changes b/Changes
index e4cce6f..983c2f7 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,9 @@
Revision history for Perl extension DBD::Firebird.
+1.13 [2013-09-09]
+ * Bring back 5.8 compatibility [ribasushi]
+ * add small delay before triggering events for ib_wait_event
+ (80-events-ithreads.t) [dam]
+ * skip ib_wait_event tests under AUTOMATED_TESTING [dam]
1.12 [2013-08-15]
* use fb_config if available for finding firebird directories
* drop usage of bytes_from_utf8 when feeding character data to firebird
diff --git a/Firebird.pm b/Firebird.pm
index f904825..dd29f12 100644
--- a/Firebird.pm
+++ b/Firebird.pm
@@ -6,7 +6,7 @@
# You may distribute under the terms of either the GNU General Public
# License or the Artistic License, as specified in the Perl README file
-require 5.10.1;
+require 5.008001;
package DBD::Firebird;
use strict;
@@ -18,7 +18,7 @@ require Exporter;
require DynaLoader;
@ISA = qw(Exporter DynaLoader);
-$VERSION = '1.12';
+$VERSION = '1.13';
bootstrap DBD::Firebird $VERSION;
diff --git a/MANIFEST b/MANIFEST
index a1bf2f7..b41719d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,6 +2,7 @@ Changes
dbdimp.c
dbdimp.h
eg/pisql
+fb_init
firebird.conf
Firebird.h
Firebird.pm
@@ -60,4 +61,5 @@ t/TestFirebirdEmbedded.pm
t/zz-cleanup.t
typemap
var/.keep_dir
-META.yml Module meta-data (added by MakeMaker)
+META.yml Module YAML meta-data (added by MakeMaker)
+META.json Module JSON meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
new file mode 100644
index 0000000..8faf044
--- /dev/null
+++ b/META.json
@@ -0,0 +1,49 @@
+{
+ "abstract" : "DBD::Firebird is a DBI driver for Firebird, written using Firebird C API.",
+ "author" : [
+ "Edwin Pratomo (edpratomo at users.sourceforge.net)"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.132140",
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+ "version" : "2"
+ },
+ "name" : "DBD-Firebird",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "Test::Exception" : "0.31",
+ "Test::More" : "0.4",
+ "Time::HiRes" : "0"
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "DBI" : "1.41"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "DBI" : "1.41",
+ "perl" : "5.008001"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "repository" : {
+ "url" : "https://github.com/mariuz/perl-dbd-firebird"
+ }
+ },
+ "version" : "1.13"
+}
diff --git a/META.yml b/META.yml
index 5f9aab4..8358eee 100644
--- a/META.yml
+++ b/META.yml
@@ -1,28 +1,27 @@
---- #YAML:1.0
-name: DBD-Firebird
-version: 1.12
-abstract: DBD::Firebird is a DBI driver for Firebird, written using Firebird C API.
+---
+abstract: 'DBD::Firebird is a DBI driver for Firebird, written using Firebird C API.'
author:
- - Edwin Pratomo (edpratomo at users.sourceforge.net)
-license: perl
-distribution_type: module
-configure_requires:
-
- File::Which: 0
- DBI: 1.41
+ - 'Edwin Pratomo (edpratomo at users.sourceforge.net)'
build_requires:
- Test::Exception: 0.31
- Test::More: 0.4
+ Test::Exception: 0.31
+ Test::More: 0.4
+ Time::HiRes: 0
+configure_requires:
+ DBI: 1.41
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.132140'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: DBD-Firebird
+no_index:
+ directory:
+ - t
+ - inc
requires:
- DBI: 1.41
- perl: 5.008001
+ DBI: 1.41
+ perl: 5.008001
resources:
- repository: https://github.com/mariuz/perl-dbd-firebird
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.57_05
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ repository: https://github.com/mariuz/perl-dbd-firebird
+version: 1.13
diff --git a/Makefile.PL b/Makefile.PL
index 2522140..bdef2a4 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -235,6 +235,7 @@ qq(*.xsi *.old t/*.old *~ t/*~ trace.txt t/trace.txt lib/DBD/Firebird/*~ lib/DBD
BUILD_REQUIRES => {
'Test::More' => 0.4,
'Test::Exception' => 0.31,
+ 'Time::HiRes' => 0,
},
LICENSE => 'perl',
MIN_PERL_VERSION => '5.008001',
diff --git a/README b/README
index c3982d9..9f5659c 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ DBD::Firebird -- DBI driver for Firebird RDBMS server.
REQUIREMENTS:
- - Perl (Threaded and version 5.10.1 or higher)
+ - Perl (Threaded and version 5.8.1 or higher)
- Perl DBI (1.41 or higher)
- Firebird (2.5.1 or higher)
- A C compiler
@@ -33,7 +33,7 @@ REQUIREMENTS:
*BEFORE* BUILDING, TESTING AND INSTALLING this you will need to:
- - Build, test and install Perl 5 (at least 5.10.1).
+ - Build, test and install Perl 5 (at least 5.8.1).
It is very important to TEST it and INSTALL it!
- Build, test and install the DBI module (at least DBI 1.41).
diff --git a/fb_init b/fb_init
new file mode 100644
index 0000000..e69de29
diff --git a/inc/FirebirdMaker.pm b/inc/FirebirdMaker.pm
index 5b8f581..a801dc7 100644
--- a/inc/FirebirdMaker.pm
+++ b/inc/FirebirdMaker.pm
@@ -232,7 +232,7 @@ sub check_and_set_devlibs {
$FB::LIB = $FB::LIB || File::Spec->catdir( $FB::HOME, 'lib' );
$FB::LIB = alternative_locations('lib') if !-d $FB::LIB;
- for my $dir ( split(/ /, $Config{libpth} ), $FB::LIB//() ) {
+ for my $dir ( split(/ /, $Config{libpth} ), $FB::LIB||() ) {
if ( -e File::Spec->catfile( $dir, 'libfbembed.so' ) ) {
$FB::libfbembed_available = 1;
print "libfbembed.so found in $dir\n";
@@ -672,7 +672,7 @@ sub create_embedded_files {
copy_mangled(
'Makefile.PL' => {
last => sub { $_[0] =~ /^exit 0/ },
- mangle => sub { $_[0] =~ s/^our \$EMBEDDED = \K0/1/ },
+ mangle => sub { $_[0] =~ s/(?<=^our \$EMBEDDED = )0/1/ },
}
);
@@ -690,7 +690,7 @@ sub create_embedded_files {
copy_mangled(
'dbdimp.c' => {
mangle =>
- sub { $_[0] =~ s/^#include "Firebird\K\.h"/Embedded.h"/ },
+ sub { $_[0] =~ s/(?<=^#include "Firebird)\.h"/Embedded.h"/ },
},
);
@@ -805,14 +805,14 @@ EOT
mangle => sub {
$_[0] =~ s/Firebird.h/FirebirdEmbedded.h/;
$_[0] =~ s/DBD::Firebird/DBD::FirebirdEmbedded/g;
- $_[0] =~ s/^INCLUDE: Firebird\K.xsi/Embedded.xsi/;
+ $_[0] =~ s/(?<=^INCLUDE: Firebird).xsi/Embedded.xsi/;
},
},
);
for my $f ( glob('t/*.t') ) {
next if $f =~ 't/embed';
- ( my $n = $f ) =~ s,t/\K,embed-,;
+ ( my $n = $f ) =~ s,t/,t/embed-,;
copy_mangled(
$f => {
new_path => $n,
diff --git a/t/75-utf8.t b/t/75-utf8.t
index 52207ae..daa1f11 100644
--- a/t/75-utf8.t
+++ b/t/75-utf8.t
@@ -25,7 +25,7 @@ plan tests => 37;
# first connect with charset ASCII
my $dsn = $T->{tdsn};
-$dsn =~ s/ib_charset=\K[^;]+/ASCII/;
+$dsn =~ s/(?<=ib_charset=)[^;]+/ASCII/;
my $attr
= { RaiseError => 1, PrintError => 0, AutoCommit => 1, ChopBlanks => 1 };
my $dbh = DBI->connect( $dsn, $T->{user}, $T->{pass}, $attr );
@@ -39,7 +39,7 @@ dies_ok(
$dbh->disconnect;
# now connect with UTF8 charset
-$dsn =~ s/ib_charset=\K[^;]+/UTF8/;
+$dsn =~ s/(?<=ib_charset=)[^;]+/UTF8/;
$dbh = DBI->connect( $dsn, $T->{user}, $T->{pass}, $attr );
# …and try to set ib_enable_utf8 again
diff --git a/t/80-event-ithreads.t b/t/80-event-ithreads.t
index cd180a7..d7292e3 100644
--- a/t/80-event-ithreads.t
+++ b/t/80-event-ithreads.t
@@ -21,6 +21,8 @@ use lib 't','.';
plan skip_all => 'DBD_FIREBIRD_TEST_SKIP_EVENTS found in the environment'
if $ENV{DBD_FIREBIRD_TEST_SKIP_EVENTS};
+use Time::HiRes qw(sleep);
+
use TestFirebird;
my $T = TestFirebird->new;
@@ -79,7 +81,10 @@ ok($dbh->func($evh, 'ib_cancel_callback'));
my $worker = sub {
my $table = shift;
- my $dbh = DBI->connect(@_, {AutoCommit => 1 }) or return 0;
+ my @dbi_args = ( shift, shift, shift );
+ my $delay = shift;
+ my $dbh = DBI->connect(@dbi_args, {AutoCommit => 1 }) or return 0;
+ sleep($delay) if $delay;
for (1..5) {
$dbh->do(qq{INSERT INTO $table VALUES($_, 'bar')});
}
@@ -119,9 +124,15 @@ SKIP: {
is($::CNT{'foo_inserted'}, 5);
is($::CNT{'foo_deleted'}, 5);
+SKIP: {
+ skip
+ "automated test of ib_wait_event -- flagile under load",
+ 4
+ if $ENV{AUTOMATED_TESTING};
+
# test ib_wait_event
%::CNT = ();
- $t = threads->create($worker, $table, $test_dsn, $test_user, $test_password);
+ $t = threads->create($worker, $table, $test_dsn, $test_user, $test_password, 0.2);
ok($t, "create thread");
for (1..6) {
my $posted_events = $dbh->func($evh, 'ib_wait_event');
@@ -132,6 +143,7 @@ SKIP: {
ok($t->join);
is($::CNT{'foo_inserted'}, 5);
is($::CNT{'foo_deleted'}, 5);
+}
}}
ok($dbh->do(qq(DROP TRIGGER ins_${table}_trig)));
diff --git a/t/TestFirebird.pm b/t/TestFirebird.pm
index cb74470..856b0ae 100644
--- a/t/TestFirebird.pm
+++ b/t/TestFirebird.pm
@@ -218,7 +218,7 @@ sub get_host {
sub get_charset {
my $self = shift;
- return $self->{charset} // 'UTF8';
+ return $self->{charset} || 'UTF8';
}
=head2 check_dsn
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbd-firebird-perl.git
More information about the Pkg-perl-cvs-commits
mailing list