[Rt-commit] r6037 - in DBIx-SearchBuilder/trunk: .
inc/Module/Install
jesse at bestpractical.com
jesse at bestpractical.com
Tue Sep 26 11:13:53 EDT 2006
Author: jesse
Date: Tue Sep 26 11:13:51 2006
New Revision: 6037
Modified:
DBIx-SearchBuilder/trunk/ (props changed)
DBIx-SearchBuilder/trunk/Changes
DBIx-SearchBuilder/trunk/MANIFEST
DBIx-SearchBuilder/trunk/META.yml
DBIx-SearchBuilder/trunk/SIGNATURE
DBIx-SearchBuilder/trunk/SearchBuilder.pm
DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm
DBIx-SearchBuilder/trunk/inc/Module/Install.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm
Log:
r27834 at pinglin: jesse | 2006-09-26 11:13:45 -0400
1.45
Modified: DBIx-SearchBuilder/trunk/Changes
==============================================================================
--- DBIx-SearchBuilder/trunk/Changes (original)
+++ DBIx-SearchBuilder/trunk/Changes Tue Sep 26 11:13:51 2006
@@ -1,6 +1,8 @@
Revision history for Perl extension DBIx::SearchBuilder.
-* Postgreg fixes:
+1.45 Tue Sep 26 11:08:20 EDT 2006
+
+* Postgres fixes:
** fix "$rec->Create();"
** fix "$rec->Create( IntegerColumn => '' );"
** fix "$rec->SetIntegerColumn( '' );"
Modified: DBIx-SearchBuilder/trunk/MANIFEST
==============================================================================
--- DBIx-SearchBuilder/trunk/MANIFEST (original)
+++ DBIx-SearchBuilder/trunk/MANIFEST Tue Sep 26 11:13:51 2006
@@ -35,6 +35,8 @@
t/01nocap_api.t
t/01records.t
t/01searches.t
+t/02records_cachable.t
+t/02records_integers.t
t/02records_object.t
t/02searches_joins.t
t/03rebless.t
Modified: DBIx-SearchBuilder/trunk/META.yml
==============================================================================
--- DBIx-SearchBuilder/trunk/META.yml (original)
+++ DBIx-SearchBuilder/trunk/META.yml Tue Sep 26 11:13:51 2006
@@ -2,7 +2,7 @@
DBD::SQLite: 0
Test::More: 0.52
distribution_type: module
-generated_by: Module::Install version 0.63
+generated_by: Module::Install version 0.64
license: perl
name: DBIx-SearchBuilder
no_index:
@@ -17,4 +17,4 @@
DBI: 0
Encode: 0
Want: 0
-version: 1.44_01
+version: 1.45
Modified: DBIx-SearchBuilder/trunk/SIGNATURE
==============================================================================
--- DBIx-SearchBuilder/trunk/SIGNATURE (original)
+++ DBIx-SearchBuilder/trunk/SIGNATURE Tue Sep 26 11:13:51 2006
@@ -14,56 +14,58 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 a077c665b9632d70422792e73434e66780ca717d Changes
-SHA1 01e6092c3c916711ef004b9975febb9f242016c6 MANIFEST
-SHA1 2f6550c6a721971f1ba635b47f1e8766a964f909 META.yml
+SHA1 1c596889ad6d44cf320e0f2e1d7b6db524405b72 Changes
+SHA1 2e9746a7afda5167d8c7ff25a88f345ea5e35a02 MANIFEST
+SHA1 d334e6a8a058e1c74d3f12ccb17df36079e151b2 META.yml
SHA1 3276df7ccabe8b5e7960c7bd319b3873749035a0 Makefile.PL
SHA1 d7a41642c368f2a587587e09f9e815d434feebff README
SHA1 5a53d12d5cccd94845a6a7cc105cd9be34e20f1c ROADMAP
-SHA1 ea47412ddba4c500bf1e5921b1f4abba8ef92e55 SearchBuilder.pm
-SHA1 a967bcdb86f1890f9c62e9fd5c84aad19f9b227c SearchBuilder/Handle.pm
+SHA1 8927ec9875c730b0a5a2f7845a89c65525d89f4a SearchBuilder.pm
+SHA1 0c1bc49940a35630ad9ff166920b8038a6d40d97 SearchBuilder/Handle.pm
SHA1 38b773e6069d3dc91308ea9e4f2ef322ddef9419 SearchBuilder/Handle/Informix.pm
SHA1 25d73426d93cece304b6eea8c786b224e14e1b5c SearchBuilder/Handle/ODBC.pm
SHA1 59871a88e8228ed27d216af9e9af0b76184fd41d SearchBuilder/Handle/Oracle.pm
-SHA1 5c9dd22995a9b45c90aba41be0f8f4860bdea6a1 SearchBuilder/Handle/Pg.pm
+SHA1 939dffb56c5dd5839732b75ef1f94722bfde0569 SearchBuilder/Handle/Pg.pm
SHA1 c7222d65546ad693a6f786ed0428084732547dc6 SearchBuilder/Handle/SQLite.pm
SHA1 088e3584eb431d1467ef7ef45a1863da52b40ea6 SearchBuilder/Handle/Sybase.pm
SHA1 0b48632b9044c8b289685c7d38c9381d74b433fe SearchBuilder/Handle/mysql.pm
SHA1 f4f6ea88631e6310243b6351e8df11e1ec88b261 SearchBuilder/Handle/mysqlPP.pm
-SHA1 ba110977e392c87703c374e2268f4ef429c6e633 SearchBuilder/Record.pm
-SHA1 a5201fbeca07c19669ce920a4d48e39634626c46 SearchBuilder/Record/Cachable.pm
+SHA1 3d6a2fe0f63a230ed447dddc72443b68f06ad22b SearchBuilder/Record.pm
+SHA1 5ca3b5fa47cfeb5711df99136548641fd01a5a95 SearchBuilder/Record/Cachable.pm
SHA1 a15065e472797e2bfe8149f04d3bdc58f67a7a6d SearchBuilder/SchemaGenerator.pm
SHA1 446f59a1fa8fa631c908f1fe3ea671c7178c9270 SearchBuilder/Union.pm
SHA1 1eb4e838ff1d8d927bfe177bf578df246802b03d SearchBuilder/Unique.pm
SHA1 e7c7c7c91025072d25da78c93cefa2bc0aaf2b35 ex/Example/Model/Address.pm
SHA1 f821661849153c21ad99393b6a3ea6720fdaf581 ex/Example/Model/Employee.pm
SHA1 9689368197327e7b38af7f3d1f863e918ed4fa98 ex/create_tables.pl
-SHA1 0bb5ddbe64424d40536acdee2f09e853ab39087d inc/Module/AutoInstall.pm
-SHA1 e28cf2d3ba35f6ca3a448acc7bee191b7c390379 inc/Module/Install.pm
-SHA1 d7013668911c86af441cad115b897fc675a472de inc/Module/Install/AutoInstall.pm
-SHA1 e7c1c86f57b6778f4bdc7fd8c1b950e60ef41bc0 inc/Module/Install/Base.pm
-SHA1 8d88f2cb120f2e64f374136df2e25d0bb6f0595b inc/Module/Install/Include.pm
-SHA1 8ac832baf4f9e8e72d3e8f103cee6e8a94ac80e1 inc/Module/Install/Makefile.pm
-SHA1 0807e79d6dbfda4fcd3db0fc7df2e33e0cba263b inc/Module/Install/Metadata.pm
+SHA1 603bb9de29fb8cba7f13409c546750972eff645d inc/Module/AutoInstall.pm
+SHA1 9b2f9d83bcf77860f53a0c07c90a4a59ad9f5df1 inc/Module/Install.pm
+SHA1 ad955f51ad2c40d4ba35395c27f5ed899a80bf7a inc/Module/Install/AutoInstall.pm
+SHA1 abe32855d75ab13747cf65765af9947b7a8c3057 inc/Module/Install/Base.pm
+SHA1 0606a8b02a420600bc3e2b65ab82f70266784926 inc/Module/Install/Include.pm
+SHA1 2249171a2b72cd73ff2c0a06597d29f86e5df456 inc/Module/Install/Makefile.pm
+SHA1 381bb98ea3877bba49ae85e7a7ea130645fd3dbf inc/Module/Install/Metadata.pm
SHA1 e59ea21b9407644714a5f67c7132a11916c25133 t/00.load.t
SHA1 a7ed1ee359ebe2842b354b5652a441403e802080 t/01basics.t
SHA1 2b2dc6f72370f60e1d233f2f8c12bb87414e825c t/01nocap_api.t
-SHA1 0b41cb395ef2894ccfbb9facd46d8667af7995fc t/01records.t
-SHA1 1fbd65dc3d1e06cb46fa75dbd92eafae6e980250 t/01searches.t
-SHA1 18c721a5d0710b2e610f28eac705d8fb6e6dd8d7 t/02records_object.t
-SHA1 15cef6b4d93f59db4d25cc89fff35f112dbd61cf t/02searches_joins.t
+SHA1 812aede3c0fd6e3cfb895f8190b9ee427189f35f t/01records.t
+SHA1 b21cfbf17b537f564510d06bf30a8fcd0f20dc69 t/01searches.t
+SHA1 48e092e60073801d12cefceb61ee303ec62f6bc2 t/02records_cachable.t
+SHA1 bae8ad859dccd45f6c6386a1596eb76e6940177e t/02records_integers.t
+SHA1 5e4b2bcef304c827e566f29d67b2d2184ff3f61f t/02records_object.t
+SHA1 c19ab98f9fda6c7f495b5cb8669b8c6a23bf4aae t/02searches_joins.t
SHA1 a1808be8dd28bd176ae0243876de36691afefefb t/03rebless.t
SHA1 b1dc1178e2f52a175d95ee7dd6218740087dc9fb t/03transactions.t
SHA1 ff8bfffa9e14d8fd492bdd3c0858ffc87de09df4 t/03versions.t
SHA1 f8f5634e7dc28068722347f47d7e05d06435e22c t/10schema.t
-SHA1 56dc809450f969d0b2f624b6e11f0b7fe3d13113 t/11schema_records.t
+SHA1 8afb80e49acc3ef8258929e06ad1bdaf1da680cd t/11schema_records.t
SHA1 e9c6a5881fc60173fbc8d479c1afd2ce3b43bef1 t/pod.t
-SHA1 dacb28645e8b80df7c190ddfedcdc957c3d08d75 t/testmodels.pl
+SHA1 afd320ea000cbe83b08691cc37bea45da20002d3 t/testmodels.pl
SHA1 4788496012998da32d01aef7e74d2070931290e0 t/utils.pl
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (Darwin)
-iD8DBQFEeN+NEi9d9xCOQEYRAp0GAKC7DsWY8cLQ2nc8GZJdpDswOzhFUACgl7YY
-goKjGe3rCv9r+v+W5xphmKo=
-=0w3a
+iD8DBQFFGUKcEi9d9xCOQEYRAqHQAKCsWgCDMW+VflysRFk2D8HCXI75LgCfYcm3
+M3f0LJfE8Sn4dtx66F41jXU=
+=OxlK
-----END PGP SIGNATURE-----
Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm (original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm Tue Sep 26 11:13:51 2006
@@ -4,7 +4,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = "1.44_01";
+$VERSION = "1.45";
use Clone qw();
Modified: DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm Tue Sep 26 11:13:51 2006
@@ -7,7 +7,7 @@
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.02';
+ $VERSION = '1.03';
}
# special map on pre-defined feature sets
@@ -214,7 +214,7 @@
}
}
- _check_lock(); # check for $UnderCPAN
+ $UnderCPAN = _check_lock(); # check for $UnderCPAN
if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
require Config;
@@ -234,9 +234,20 @@
*{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
}
-# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS
+# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+# if we are, then we simply let it taking care of our dependencies
sub _check_lock {
return unless @Missing;
+
+ if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+ print <<'END_MESSAGE';
+
+*** Since we're running under CPANPLUS, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ return 1;
+ }
+
_load_cpan();
# Find the CPAN lock-file
@@ -256,10 +267,11 @@
*** Since we're running under CPAN, I'll just let it take care
of the dependency's installation later.
END_MESSAGE
- $UnderCPAN = 1;
+ return 1;
}
close LOCK;
+ return;
}
sub install {
@@ -280,7 +292,8 @@
}
}
- return @installed unless @modules; # nothing to do
+ return @installed unless @modules; # nothing to do
+ return @installed if _check_lock(); # defer to the CPAN shell
print "*** Installing dependencies...\n";
@@ -300,7 +313,7 @@
@modules = @newmod;
}
- if ( ! $UnderCPAN and _has_cpanplus() ) {
+ if ( _has_cpanplus() ) {
_install_cpanplus( \@modules, \@config );
} else {
_install_cpan( \@modules, \@config );
@@ -466,9 +479,9 @@
delete $INC{$inc};
}
- $obj->force('install') if $args{force};
-
- my $rv = $obj->install || eval {
+ my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
+ : CPAN::Shell->install($pkg);
+ $rv ||= eval {
$CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
->{install}
if $CPAN::META;
@@ -752,4 +765,4 @@
__END__
-#line 990
+#line 1003
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install.pm Tue Sep 26 11:13:51 2006
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.63';
+ $VERSION = '0.64';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm Tue Sep 26 11:13:51 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.63';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm Tue Sep 26 11:13:51 2006
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.63';
+$VERSION = '0.64';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm Tue Sep 26 11:13:51 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.63';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm Tue Sep 26 11:13:51 2006
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.63';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm Tue Sep 26 11:13:51 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.63';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
More information about the Rt-commit
mailing list