Skip to content

Commit

Permalink
Revert addition of superficial relationship in r5886
Browse files Browse the repository at this point in the history
  • Loading branch information
@ribasushi
ribasushi committed Apr 30, 2009
1 parent b3b13ec commit 56b73f8
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 66 deletions.
9 changes: 5 additions & 4 deletions t/66relationship.t
View file
Expand Up @@ -290,12 +290,13 @@ my $rs_overridden = $schema->source('ForceForeign');
my $relinfo_with_attr = $rs_overridden->relationship_info ('cd_3');
cmp_ok($relinfo_with_attr->{attrs}{is_foreign_key_constraint}, '==', 0, "is_foreign_key_constraint defined for belongs_to relationships with attr.");

# check that relationships below left join relationships are forced to left joins
my $cds = $schema->resultset("CD")->search({ cdid => 1 }, { join => { genre => 'demographic' } });
# check that relationships below left join relationships are forced to left joins
# when traversing multiple belongs_to
my $cds = $schema->resultset("CD")->search({ 'me.cdid' => 5 }, { join => { single_track => 'cd' } });
is($cds->count, 1, "subjoins under left joins force_left (string)");

$cds = $schema->resultset("CD")->search({ cdid => 1 }, { join => { genre => [ 'demographic' ] } });
$cds = $schema->resultset("CD")->search({ 'me.cdid' => 5 }, { join => { single_track => ['cd'] } });
is($cds->count, 1, "subjoins under left joins force_left (arrayref)");

$cds = $schema->resultset("CD")->search({ cdid => 1 }, { join => { genre => { demographic => {} } } });
$cds = $schema->resultset("CD")->search({ 'me.cdid' => 5 }, { join => { single_track => { cd => {} } } });
is($cds->count, 1, "subjoins under left joins force_left (hashref)");
2 changes: 1 addition & 1 deletion t/93single_accessor_object.t
View file
Expand Up @@ -56,7 +56,7 @@ $schema = DBICTest->init_schema();

{
my $artist = $schema->resultset('Artist')->create({ artistid => 666, name => 'bad religion' });
my $genre = $schema->resultset('Genre')->create({ genreid => 88, name => 'disco', demographicid => 1 });
my $genre = $schema->resultset('Genre')->create({ genreid => 88, name => 'disco' });
my $cd = $schema->resultset('CD')->create({ cdid => 187, artist => 1, title => 'how could hell be any worse?', year => 1982 });

dies_ok { $cd->genre } 'genre accessor throws without column';
Expand Down
18 changes: 0 additions & 18 deletions t/96multi_create_torture.t
View file
Expand Up @@ -27,9 +27,6 @@ eval {
year => '2012',
genre => {
name => '"Greatest" collections',
demographic => {
name => '"Greatest" collections demographic',
},
},
tags => [
{ tag => 'A' },
Expand All @@ -50,9 +47,6 @@ eval {
year => 2012,
genre => {
name => '"Greatest" collections',
demographic => {
name => '"Greatest" collections demographic',
},
},
tags => [
{ tag => 'A' },
Expand All @@ -74,9 +68,6 @@ eval {
year => 2012,
genre => {
name => '"Greatest" collections',
demographic => {
name => '"Greatest" collections demographic',
},
},
tags => [
{ tag => 'A' },
Expand All @@ -88,9 +79,6 @@ eval {
year => 2012,
genre => {
name => '"Greatest" collections2',
demographic => {
name => '"Greatest" collections demographic',
},
},
tags => [
{ tag => 'A' },
Expand All @@ -103,9 +91,6 @@ eval {
year => 2013,
genre => {
name => '"Greatest" collections2',
demographic => {
name => '"Greatest" collections demographic',
},
},
}},
],
Expand All @@ -118,9 +103,6 @@ eval {
year => 2012,
genre => {
name => '"Greatest" collections',
demographic => {
name => '"Greatest" collections demographic',
},
},
tags => [
{ tag => 'A' },
Expand Down
1 change: 0 additions & 1 deletion t/lib/DBICTest/Schema.pm
View file
Expand Up @@ -11,7 +11,6 @@ __PACKAGE__->load_classes(qw/
BindType
Employee
CD
Demographic
FileColumn
Genre
Link
Expand Down
4 changes: 3 additions & 1 deletion t/lib/DBICTest/Schema/CD.pm
View file
Expand Up @@ -38,7 +38,9 @@ __PACKAGE__->belongs_to( artist => 'DBICTest::Schema::Artist', undef, {
});

# in case this is a single-cd it promotes a track from another cd
__PACKAGE__->belongs_to( single_track => 'DBICTest::Schema::Track' );
__PACKAGE__->belongs_to( single_track => 'DBICTest::Schema::Track', 'single_track',
{ join_type => 'left'}
);

__PACKAGE__->has_many( tracks => 'DBICTest::Schema::Track' );
__PACKAGE__->has_many(
Expand Down
21 changes: 0 additions & 21 deletions t/lib/DBICTest/Schema/Demographic.pm
View file

This file was deleted.

5 changes: 0 additions & 5 deletions t/lib/DBICTest/Schema/Genre.pm
View file
Expand Up @@ -14,15 +14,10 @@ __PACKAGE__->add_columns(
data_type => 'varchar',
size => 100,
},
demographicid => {
data_type => 'integer',
is_nullable => 0,
},
);
__PACKAGE__->set_primary_key('genreid');
__PACKAGE__->add_unique_constraint ( genre_name => [qw/name/] );

__PACKAGE__->has_many (cds => 'DBICTest::Schema::CD', 'genreid');
__PACKAGE__->belongs_to (demographic => 'DBICTest::Schema::Demographic', 'demographicid');

1;
17 changes: 2 additions & 15 deletions t/lib/sqlite.sql
View file
@@ -1,6 +1,6 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Sun Apr 19 11:49:48 2009
-- Created on Thu Apr 30 10:04:57 2009
--


Expand Down Expand Up @@ -136,16 +136,6 @@ CREATE INDEX collection_object_idx_collection_collection_obj ON collection_objec

CREATE INDEX collection_object_idx_object_c ON collection_object (object);

--
-- Table: demographic
--
CREATE TABLE demographic (
demographicid INTEGER PRIMARY KEY NOT NULL,
name varchar(100) NOT NULL
);

CREATE UNIQUE INDEX demographic_name_demographic ON demographic (name);

--
-- Table: employee
--
Expand Down Expand Up @@ -231,12 +221,9 @@ CREATE INDEX fourkeys_to_twokeys_idx_t_artist_t_cd_fourkeys_to ON fourkeys_to_tw
--
CREATE TABLE genre (
genreid INTEGER PRIMARY KEY NOT NULL,
name varchar(100) NOT NULL,
demographicid integer NOT NULL
name varchar(100) NOT NULL
);

CREATE INDEX genre_idx_demographicid_genre ON genre (demographicid);

CREATE UNIQUE INDEX genre_name_genre ON genre (name);

--
Expand Down

0 comments on commit 56b73f8

Please sign in to comment.