[Bast-commits] r4466 - in
DBIx-Class/0.08/branches/replication_dedux: . lib/DBIx/Class
lib/SQL/Translator/Parser/DBIx t t/lib/DBICTest
t/lib/DBICTest/Schema
jnapiorkowski at dev.catalyst.perl.org
jnapiorkowski at dev.catalyst.perl.org
Wed Jun 4 18:12:45 BST 2008
Author: jnapiorkowski
Date: 2008-06-04 18:12:45 +0100 (Wed, 04 Jun 2008)
New Revision: 4466
Removed:
DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm
Modified:
DBIx-Class/0.08/branches/replication_dedux/
DBIx-Class/0.08/branches/replication_dedux/Makefile.PL
DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/Relationship.pm
DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/ResultSet.pm
DBIx-Class/0.08/branches/replication_dedux/lib/SQL/Translator/Parser/DBIx/Class.pm
DBIx-Class/0.08/branches/replication_dedux/t/71mysql.t
DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t
DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm
Log:
r13529 at dev (orig r4456): castaway | 2008-06-02 13:46:12 -0500
I suck, should read code while doccing it, not assume someone else got it right!
r13584 at dev (orig r4462): ash | 2008-06-03 11:11:25 -0500
Remove the length limit on identifiers - it doesn't belong in DBIx::Class
A few doc fixes
r13585 at dev (orig r4463): ash | 2008-06-03 13:15:27 -0500
Remove Digest::SHA1 dep too
Property changes on: DBIx-Class/0.08/branches/replication_dedux
___________________________________________________________________
Name: svk:merge
- 168d5346-440b-0410-b799-f706be625ff1:/DBIx-Class-current:2207
462d4d0c-b505-0410-bf8e-ce8f877b3390:/local/bast/DBIx-Class:3159
9c88509d-e914-0410-b01c-b9530614cbfe:/local/DBIx-Class:32260
9c88509d-e914-0410-b01c-b9530614cbfe:/local/DBIx-Class-CDBICompat:54993
9c88509d-e914-0410-b01c-b9530614cbfe:/vendor/DBIx-Class:31122
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/cdbicompat_integration:4160
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/file_column:3920
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/on_disconnect_do:3694
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/oracle_sequence:4173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/savepoints:4223
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/storage-ms-access:4142
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/versioned_enhancements:4125
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/trunk:4451
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-C3:318
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-current:2222
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-joins:173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-resultset:570
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/datetime:1716
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/find_compat:1855
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/find_unique_query_fixes:2142
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/inflate:1988
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/many_to_many:2025
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/re_refactor_bugfix:1944
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/reorganize_tests:1827
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset-new-refactor:1766
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset_2_electric_boogaloo:2175
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset_cleanup:2102
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/sqlt_tests_refactor:2043
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class:3606
fe160bb6-dc1c-0410-9f2b-d64a711b54a5:/local/DBIC-trunk-0.08:10510
+ 168d5346-440b-0410-b799-f706be625ff1:/DBIx-Class-current:2207
462d4d0c-b505-0410-bf8e-ce8f877b3390:/local/bast/DBIx-Class:3159
9c88509d-e914-0410-b01c-b9530614cbfe:/local/DBIx-Class:32260
9c88509d-e914-0410-b01c-b9530614cbfe:/local/DBIx-Class-CDBICompat:54993
9c88509d-e914-0410-b01c-b9530614cbfe:/vendor/DBIx-Class:31122
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/cdbicompat_integration:4160
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/file_column:3920
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/on_disconnect_do:3694
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/oracle_sequence:4173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/savepoints:4223
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/storage-ms-access:4142
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/branches/versioned_enhancements:4125
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/DBIx-Class/0.08/trunk:4463
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-C3:318
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-current:2222
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-joins:173
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class-resultset:570
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/datetime:1716
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/find_compat:1855
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/find_unique_query_fixes:2142
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/inflate:1988
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/many_to_many:2025
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/re_refactor_bugfix:1944
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/reorganize_tests:1827
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset-new-refactor:1766
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset_2_electric_boogaloo:2175
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/resultset_cleanup:2102
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/branches/DBIx-Class/sqlt_tests_refactor:2043
bd8105ee-0ff8-0310-8827-fb3f25b6796d:/trunk/DBIx-Class:3606
fe160bb6-dc1c-0410-9f2b-d64a711b54a5:/local/DBIC-trunk-0.08:10510
Modified: DBIx-Class/0.08/branches/replication_dedux/Makefile.PL
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/Makefile.PL 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/Makefile.PL 2008-06-04 17:12:45 UTC (rev 4466)
@@ -22,7 +22,6 @@
requires 'Class::Accessor::Grouped' => 0.05002;
requires 'JSON::Any' => 1.00;
requires 'Scope::Guard' => 0.03;
-requires 'Digest::SHA1' => 2.00;
requires 'Path::Class' => 0;
requires 'List::Util' => 1.19;
Modified: DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/Relationship.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/Relationship.pm 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/Relationship.pm 2008-06-04 17:12:45 UTC (rev 4466)
@@ -222,12 +222,13 @@
=back
-Creates a one-to-many relationship, where the corresponding elements of the
-foreign class store the calling class's primary key in one (or more) of its
-columns. This relationship defaults to using C<$accessor_name> as the foreign
-key in C<$related_class> to resolve the join, unless C<$foreign_key_column>
-specifies the foreign key column in C<$related_class> or C<cond> specifies a
-reference to a join condition hash.
+Creates a one-to-many relationship, where the corresponding elements
+of the foreign class store the calling class's primary key in one (or
+more) of its columns. This relationship defaults to using the end of
+this classes namespace as the foreign key in C<$related_class> to
+resolve the join, unless C<$foreign_key_column> specifies the foreign
+key column in C<$related_class> or C<cond> specifies a reference to a
+join condition hash.
=over
@@ -273,26 +274,28 @@
=back
# in an Author class (where Author has_many Books)
+ # assuming related class is storing our PK in "author_id"
My::DBIC::Schema::Author->has_many(
books =>
'My::DBIC::Schema::Book',
'author_id'
);
- # OR (same result, assuming related_class is storing our PK)
+ # OR (same result)
My::DBIC::Schema::Author->has_many(
books =>
'My::DBIC::Schema::Book',
+ { 'foreign.author_id' => 'self.id' },
);
-
- # OR (same result)
+
+ # OR (similar result, assuming related_class is storing our PK, in "author")
+ # (the "author" is guessed at from "Author" in the class namespace)
My::DBIC::Schema::Author->has_many(
books =>
'My::DBIC::Schema::Book',
- { 'foreign.author_id' => 'self.id' },
);
-
+
# Usage
# resultset of Books belonging to author
my $booklist = $author->books;
Modified: DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/ResultSet.pm 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/lib/DBIx/Class/ResultSet.pm 2008-06-04 17:12:45 UTC (rev 4466)
@@ -2435,14 +2435,28 @@
case.
Simple prefetches will be joined automatically, so there is no need
-for a C<join> attribute in the above search. If you're prefetching to
-depth (e.g. { cd => { artist => 'label' } or similar), you'll need to
-specify the join as well.
+for a C<join> attribute in the above search.
C<prefetch> can be used with the following relationship types: C<belongs_to>,
C<has_one> (or if you're using C<add_relationship>, any relationship declared
-with an accessor type of 'single' or 'filter').
+with an accessor type of 'single' or 'filter'). A more complex example that
+prefetches an artists cds, the tracks on those cds, and the tags associted
+with that artist is given below (assuming many-to-many from artists to tags):
+ my $rs = $schema->resultset('Artist')->search(
+ undef,
+ {
+ prefetch => [
+ { cds => 'tracks' },
+ { artist_tags => 'tags' }
+ ]
+ }
+ );
+
+
+B<NOTE:> If you specify a C<prefetch> attribute, the C<join> and C<select>
+attributes will be ignored.
+
=head2 page
=over 4
Modified: DBIx-Class/0.08/branches/replication_dedux/lib/SQL/Translator/Parser/DBIx/Class.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/lib/SQL/Translator/Parser/DBIx/Class.pm 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/lib/SQL/Translator/Parser/DBIx/Class.pm 2008-06-04 17:12:45 UTC (rev 4466)
@@ -14,7 +14,6 @@
use Exporter;
use Data::Dumper;
-use Digest::SHA1 qw( sha1_hex );
use SQL::Translator::Utils qw(debug normalize_name);
use base qw(Exporter);
@@ -101,7 +100,7 @@
if (!$source->compare_relationship_keys($unique_constraints{$uniq}, \@primary)) {
$table->add_constraint(
type => 'unique',
- name => _create_unique_symbol($uniq),
+ name => $uniq,
fields => $unique_constraints{$uniq}
);
}
@@ -169,9 +168,7 @@
if (scalar(@keys)) {
$table->add_constraint(
type => 'foreign_key',
- name => _create_unique_symbol($table->name
- . '_fk_'
- . join('_', @keys)),
+ name => join('_', $table->name, 'fk', @keys),
fields => \@keys,
reference_fields => \@refkeys,
reference_table => $rel_table,
@@ -181,7 +178,7 @@
);
my $index = $table->add_index(
- name => _create_unique_symbol(join('_', $table->name, 'idx', @keys)),
+ name => join('_', $table->name, 'idx', @keys),
fields => \@keys,
type => 'NORMAL',
);
@@ -201,31 +198,4 @@
return 1;
}
-# TODO - is there a reasonable way to pass configuration?
-# Default of 64 comes from mysql's limit.
-our $MAX_SYMBOL_LENGTH ||= 64;
-our $COLLISION_TAG_LENGTH ||= 8;
-
-# -------------------------------------------------------------------
-# $resolved_name = _create_unique_symbol($desired_name)
-#
-# If desired_name is really long, it will be truncated in a way that
-# has a high probability of leaving it unique.
-# -------------------------------------------------------------------
-sub _create_unique_symbol {
- my $desired_name = shift;
- return $desired_name if length $desired_name <= $MAX_SYMBOL_LENGTH;
-
- my $truncated_name = substr $desired_name, 0, $MAX_SYMBOL_LENGTH - $COLLISION_TAG_LENGTH - 1;
-
- # Hex isn't the most space-efficient, but it skirts around allowed
- # charset issues
- my $digest = sha1_hex($desired_name);
- my $collision_tag = substr $digest, 0, $COLLISION_TAG_LENGTH;
-
- return $truncated_name
- . '_'
- . $collision_tag;
-}
-
1;
Modified: DBIx-Class/0.08/branches/replication_dedux/t/71mysql.t
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/71mysql.t 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/t/71mysql.t 2008-06-04 17:12:45 UTC (rev 4466)
@@ -86,9 +86,10 @@
}
## Can we properly deal with the null search problem?
+##
+## Only way is to do a SET SQL_AUTO_IS_NULL = 0; on connect
+## But I'm not sure if we should do this or not (Ash, 2008/06/03)
-use Data::Dump qw/dump/;
-
NULLINSEARCH: {
ok my $artist1_rs = $schema->resultset('Artist')->search({artistid=>6666})
Modified: DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t 2008-06-04 17:12:45 UTC (rev 4466)
@@ -10,7 +10,7 @@
my $schema = DBICTest->init_schema;
-plan tests => 160;
+plan tests => 131;
my $translator = SQL::Translator->new(
parser_args => {
@@ -203,35 +203,6 @@
},
],
- # LongColumns
- long_columns => [
- {
- 'display' => 'long_columns->owner',
- 'name' => 'long_columns_fk__64_character_column_aaaaaaaaaaaaaaaaaa_cfc8d5b0',
- 'index_name' => 'long_columns_idx__64_character_column_aaaaaaaaaaaaaaaaa_5050aa42',
- 'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
- 'foreigncols' => ['lcid'],
- on_delete => '', on_update => '', deferrable => 1,
- },
- {
- 'display' => 'long_columns->owner2',
- 'name' => 'long_columns_fk__32_character_column_bbbbbbbbbbb__32_ch_b7ee284e',
- 'index_name' => 'long_columns_idx__32_character_column_bbbbbbbbbbb__32_c_82bf6e69',
- 'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['_32_character_column_bbbbbbbbbbb', '_32_character_column_aaaaaaaaaaa'],
- 'foreigncols' => ['_32_character_column_aaaaaaaaaaa', '_32_character_column_bbbbbbbbbbb'],
- on_delete => '', on_update => '', deferrable => 1,
- },
- {
- 'display' => 'long_columns->owner3',
- 'name' => 'long_columns_fk__16_chars_column',
- 'index_name' => 'long_columns_idx__16_chars_column',
- 'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['_16_chars_column'], 'foreigncols' => ['_8_chr_c'],
- on_delete => '', on_update => '', deferrable => 1,
- },
- ],
);
my %unique_constraints = (
@@ -253,29 +224,6 @@
},
],
- long_columns => [
- {
- 'display' => 'long but not quite truncated unique',
- 'name' => 'long_columns__16_chars_column__32_character_column_aaaaaaaaaaa',
- 'table' => 'long_columns', 'cols' => [qw( _32_character_column_aaaaaaaaaaa _16_chars_column )],
- },
- {
- 'display' => 'multi column truncated unique',
- 'name' => 'long_columns__8_chr_c__16_chars_column__32_character_co_004ce318',
- 'table' => 'long_columns', 'cols' => [qw( _32_character_column_aaaaaaaaaaa _16_chars_column _8_chr_c )],
- },
- {
- 'display' => 'different multi column truncated unique with same base',
- 'name' => 'long_columns__8_chr_c__16_chars_column__32_character_co_25773323',
- 'table' => 'long_columns', 'cols' => [qw( _32_character_column_bbbbbbbbbbb _16_chars_column _8_chr_c )],
- },
- {
- 'display' => 'single column truncated unique',
- 'name' => 'long_columns__64_character_column_aaaaaaaaaaaaaaaaaaaaa_0acf5172',
- 'table' => 'long_columns', 'cols' => ['_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
- },
- ],
-
# TwoKeyTreeLike
twokeytreelike => [
{
@@ -364,6 +312,7 @@
my %fields = map { $_ => 1 } @$cols;
my %f_fields = map { $_ => 1 } @$f_cols;
+ die "No $table_name" unless $table;
CONSTRAINT:
for my $constraint ( $table->get_constraints ) {
next unless $constraint->type eq $type;
Deleted: DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm 2008-06-04 17:12:45 UTC (rev 4466)
@@ -1,64 +0,0 @@
-package # hide from PAUSE
- DBICTest::Schema::LongColumns;
-
-use base qw/DBIx::Class::Core/;
-
-__PACKAGE__->table('long_columns');
-__PACKAGE__->add_columns(
- 'lcid' => {
- data_type => 'int',
- is_auto_increment => 1,
- },
- '_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' => {
- data_type => 'int',
- },
- '_32_character_column_aaaaaaaaaaa' => {
- data_type => 'int',
- },
- '_32_character_column_bbbbbbbbbbb' => {
- data_type => 'int',
- },
- '_16_chars_column' => {
- data_type => 'int',
- },
- '_8_chr_c' => {
- data_type => 'int',
- },
-);
-
-__PACKAGE__->set_primary_key('lcid');
-
-__PACKAGE__->add_unique_constraint([qw( _16_chars_column _32_character_column_aaaaaaaaaaa )]);
-
-__PACKAGE__->add_unique_constraint([qw( _8_chr_c _16_chars_column _32_character_column_aaaaaaaaaaa )]);
-
-__PACKAGE__->add_unique_constraint([qw( _8_chr_c _16_chars_column _32_character_column_bbbbbbbbbbb )]);
-
-__PACKAGE__->add_unique_constraint([qw( _64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa )]);
-
-__PACKAGE__->belongs_to(
- 'owner',
- 'DBICTest::Schema::LongColumns',
- {
- 'foreign.lcid' => 'self._64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
- },
-);
-
-__PACKAGE__->belongs_to(
- 'owner2',
- 'DBICTest::Schema::LongColumns',
- {
- 'foreign._32_character_column_aaaaaaaaaaa' => 'self._32_character_column_bbbbbbbbbbb',
- 'foreign._32_character_column_bbbbbbbbbbb' => 'self._32_character_column_aaaaaaaaaaa',
- },
-);
-
-__PACKAGE__->belongs_to(
- 'owner3',
- 'DBICTest::Schema::LongColumns',
- {
- 'foreign._8_chr_c' => 'self._16_chars_column',
- },
-);
-
-1;
Modified: DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm 2008-06-04 14:30:26 UTC (rev 4465)
+++ DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm 2008-06-04 17:12:45 UTC (rev 4466)
@@ -36,10 +36,8 @@
'CD_to_Producer',
),
qw/SelfRefAlias TreeLike TwoKeyTreeLike Event EventTZ NoPrimaryKey/,
- qw/Collection CollectionObject TypedObject/,
- qw/Owners BooksInLibrary/,
+ qw/Collection CollectionObject TypedObject Owners BooksInLibrary/,
qw/ForceForeign/,
- qw/LongColumns/,
);
sub sqlt_deploy_hook {
More information about the Bast-commits
mailing list