minor update, which integrates patches.

add JSON to regress depends, missed that previously.
This commit is contained in:
espie 2007-01-14 11:09:26 +00:00
parent 3165197035
commit 7e635280da
4 changed files with 17 additions and 37 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2006/12/06 15:09:08 espie Exp $
# $OpenBSD: Makefile,v 1.4 2007/01/14 11:09:26 espie Exp $
COMMENT= "object-oriented database access"
MODULES= cpan
DISTNAME= DBIx-Class-0.07003
PKGNAME= p5-${DISTNAME}p0
DISTNAME= DBIx-Class-0.07005
PKGNAME= p5-${DISTNAME}
CATEGORIES= databases devel
# Artistic
@ -32,10 +32,18 @@ REGRESS_DEPENDS=::databases/p5-DBD-SQLite \
::devel/p5-Test-Memory-Cycle \
::textproc/p5-Text-CSV_XS \
::devel/p5-DateTime-Format-MySQL \
::databases/p5-SQL-Translator
::databases/p5-SQL-Translator \
::converters/p5-JSON
MAKE_ENV= DATA_DUMPER_TEST=Yes \
DBICTEST_FORK_STRESS=Yes \
TEST_POD=Yes
TEST_POD=Yes \
DBICTEST_PG_DSN='dbi:Pg:dbname=test;host=localhost' \
DBICTEST_PG_USER=postgres \
DBICTEST_PG_PASS= \
DBICTEST_MYSQL_DSN='dbi:mysql:database=test;host=localhost' \
DBICTEST_MYSQL_USER=root \
DBICTEST_MYSQL_PASS=
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (DBIx-Class-0.07003.tar.gz) = 3121dc077ab563e75d4233d37dd81e9c
RMD160 (DBIx-Class-0.07003.tar.gz) = 6d91a9d0e7ff4da5408c350d4e2b35ab9dfbf9f7
SHA1 (DBIx-Class-0.07003.tar.gz) = 65bab78d2d1ed349c9c306b23ac969ad64b24000
SIZE (DBIx-Class-0.07003.tar.gz) = 183196
MD5 (DBIx-Class-0.07005.tar.gz) = 87146b4dc26006775a63c3f4ea637449
RMD160 (DBIx-Class-0.07005.tar.gz) = ee2291eb032710bc30f8f3ebe811b97bdb0745ca
SHA1 (DBIx-Class-0.07005.tar.gz) = 5b2f4a6caf6d7a47fab4c3c39207f1a3011f9da0
SIZE (DBIx-Class-0.07005.tar.gz) = 183612

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-lib_DBIx_Class_Relationship_HasMany_pm,v 1.1 2006/12/06 15:09:08 espie Exp $
--- lib/DBIx/Class/Relationship/HasMany.pm.orig Wed Dec 6 15:56:28 2006
+++ lib/DBIx/Class/Relationship/HasMany.pm Wed Dec 6 15:57:00 2006
@@ -16,6 +16,10 @@ sub has_many {
"${class} has more"
) if $too_many;
+ $class->throw_exception(
+ "has_many needs a primary key to infer a join; ".
+ "${class} has none"
+ ) if !defined $pri;
my ($f_key,$guess);
if (defined $cond && length $cond) {
$f_key = $cond;

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-lib_DBIx_Class_Relationship_HasOne_pm,v 1.1 2006/12/06 15:09:08 espie Exp $
--- lib/DBIx/Class/Relationship/HasOne.pm.orig Wed Dec 6 15:57:05 2006
+++ lib/DBIx/Class/Relationship/HasOne.pm Wed Dec 6 15:58:09 2006
@@ -21,6 +21,10 @@ sub _has_one {
"might_have/has_one can only infer join for a single primary key; ".
"${class} has more"
) if $too_many;
+ $class->throw_exception(
+ "might_have/has_one needs a primary key to infer a join; ".
+ "${class} has none"
+ ) if !defined $pri;
my $f_class_loaded = eval { $f_class->columns };
my ($f_key,$guess);
if (defined $cond && length $cond) {