[Bast-commits] r4358 - in
DBIx-Class/0.08/branches/replication_dedux: . t t/cdbi-t
t/lib/DBICTest t/lib/DBICTest/Schema
jnapiorkowski at dev.catalyst.perl.org
jnapiorkowski at dev.catalyst.perl.org
Wed May 7 22:16:22 BST 2008
Author: jnapiorkowski
Date: 2008-05-07 22:16:22 +0100 (Wed, 07 May 2008)
New Revision: 4358
Added:
DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/Dummy.pm
Modified:
DBIx-Class/0.08/branches/replication_dedux/
DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t
DBIx-Class/0.08/branches/replication_dedux/t/cdbi-t/set_to_undef.t
DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm
DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm
Log:
r8564 at dev (orig r4356): ribasushi | 2008-05-07 10:25:41 -0500
Correct order of BEGIN/use so that skip_all does not produce failures
r8565 at dev (orig r4357): ribasushi | 2008-05-07 11:37:56 -0500
Various fixes to make testing with DBICTEST_SQLT_DEPLOY=1 possible
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:4354
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:4357
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/t/86sqlt.t
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t 2008-05-07 16:37:56 UTC (rev 4357)
+++ DBIx-Class/0.08/branches/replication_dedux/t/86sqlt.t 2008-05-07 21:16:22 UTC (rev 4358)
@@ -207,28 +207,28 @@
long_columns => [
{
'display' => 'long_columns->owner',
- 'name' => 'long_columns_fk_64_character_column_aaaaaaaaaaaaaaaaaaa_1ca973e2',
- 'index_name' => '64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ 'name' => 'long_columns_fk__64_character_column_aaaaaaaaaaaaaaaaaa_cfc8d5b0',
+ 'index_name' => '_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
+ 'selfcols' => ['_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
'foreigncols' => ['lcid'],
on_delete => '', on_update => '', deferrable => 1,
},
{
'display' => 'long_columns->owner2',
- 'name' => 'long_columns_fk_32_character_column_aaaaaaaaaaaa_32_cha_6060a8f3',
- 'index_name' => '32_character_column_aaaaaaaaaaaa_32_character_column_bb_30f7a7fe',
+ 'name' => 'long_columns_fk__32_character_column_aaaaaaaaaaa__32_ch_12bdb9cf',
+ 'index_name' => '_32_character_column_aaaaaaaaaaa__32_character_column_b_6fa7ff05',
'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['32_character_column_bbbbbbbbbbbb', '32_character_column_aaaaaaaaaaaa'],
- 'foreigncols' => ['32_character_column_aaaaaaaaaaaa', '32_character_column_bbbbbbbbbbbb'],
+ '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_character_col',
- 'index_name' => '16_character_col',
+ 'name' => 'long_columns_fk__16_chars_column',
+ 'index_name' => '_16_chars_column',
'selftable' => 'long_columns', 'foreigntable' => 'long_columns',
- 'selfcols' => ['16_character_col'], 'foreigncols' => ['8_char_c'],
+ 'selfcols' => ['_16_chars_column'], 'foreigncols' => ['_8_chr_c'],
on_delete => '', on_update => '', deferrable => 1,
},
],
@@ -256,23 +256,23 @@
long_columns => [
{
'display' => 'long but not quite truncated unique',
- 'name' => 'long_columns_16_character_col_32_character_column_aaaaaaaaaaaa',
- 'table' => 'long_columns', 'cols' => [qw( 32_character_column_aaaaaaaaaaaa 16_character_col )],
+ '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_char_c_16_character_col_32_character_col_ee4a438c',
- 'table' => 'long_columns', 'cols' => [qw( 32_character_column_aaaaaaaaaaaa 16_character_col 8_char_c )],
+ '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_char_c_16_character_col_32_character_col_c5dbc7a7',
- 'table' => 'long_columns', 'cols' => [qw( 32_character_column_bbbbbbbbbbbb 16_character_col 8_char_c )],
+ '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_aaaaaaaaaaaaaaaaaaaaaa_095dc664',
- 'table' => 'long_columns', 'cols' => ['64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
+ 'name' => 'long_columns__64_character_column_aaaaaaaaaaaaaaaaaaaaa_0acf5172',
+ 'table' => 'long_columns', 'cols' => ['_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
},
],
@@ -306,8 +306,8 @@
my $tschema = $translator->schema();
# Test that the $schema->sqlt_deploy_hook was called okay and that it removed
-# the 'link' table
-ok( !defined($tschema->get_table('link')), "Link table was removed by hook");
+# the 'dummy' table
+ok( !defined($tschema->get_table('dummy')), "Dummy table was removed by hook");
# Test that nonexistent constraints are not found
my $constraint = get_constraint('FOREIGN KEY', 'cd', ['title'], 'cd', ['year']);
Modified: DBIx-Class/0.08/branches/replication_dedux/t/cdbi-t/set_to_undef.t
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/cdbi-t/set_to_undef.t 2008-05-07 16:37:56 UTC (rev 4357)
+++ DBIx-Class/0.08/branches/replication_dedux/t/cdbi-t/set_to_undef.t 2008-05-07 21:16:22 UTC (rev 4358)
@@ -2,7 +2,6 @@
use strict;
use Test::More;
-use Test::NoWarnings;
BEGIN {
eval "use DBIx::Class::CDBICompat;";
@@ -12,6 +11,8 @@
plan tests => 1;
}
+use Test::NoWarnings;
+
{
package Thing;
Added: DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/Dummy.pm
===================================================================
--- DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/Dummy.pm (rev 0)
+++ DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/Dummy.pm 2008-05-07 21:16:22 UTC (rev 4358)
@@ -0,0 +1,23 @@
+package # hide from PAUSE
+ DBICTest::Schema::Dummy;
+
+use base 'DBIx::Class::Core';
+
+use strict;
+use warnings;
+
+__PACKAGE__->table('dummy');
+__PACKAGE__->add_columns(
+ 'id' => {
+ data_type => 'integer',
+ is_auto_increment => 1
+ },
+ 'gittery' => {
+ data_type => 'varchar',
+ size => 100,
+ is_nullable => 1,
+ },
+);
+__PACKAGE__->set_primary_key('id');
+
+1;
Modified: 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-05-07 16:37:56 UTC (rev 4357)
+++ DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema/LongColumns.pm 2008-05-07 21:16:22 UTC (rev 4358)
@@ -1,4 +1,4 @@
-package # hide from PAUSE
+package # hide from PAUSE
DBICTest::Schema::LongColumns;
use base qw/DBIx::Class::Core/;
@@ -9,38 +9,38 @@
data_type => 'int',
is_auto_increment => 1,
},
- '64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' => {
+ '_64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' => {
data_type => 'int',
},
- '32_character_column_aaaaaaaaaaaa' => {
+ '_32_character_column_aaaaaaaaaaa' => {
data_type => 'int',
},
- '32_character_column_bbbbbbbbbbbb' => {
+ '_32_character_column_bbbbbbbbbbb' => {
data_type => 'int',
},
- '16_character_col' => {
+ '_16_chars_column' => {
data_type => 'int',
},
- '8_char_c' => {
+ '_8_chr_c' => {
data_type => 'int',
},
);
__PACKAGE__->set_primary_key('lcid');
-__PACKAGE__->add_unique_constraint([qw( 16_character_col 32_character_column_aaaaaaaaaaaa )]);
+__PACKAGE__->add_unique_constraint([qw( _16_chars_column _32_character_column_aaaaaaaaaaa )]);
-__PACKAGE__->add_unique_constraint([qw( 8_char_c 16_character_col 32_character_column_aaaaaaaaaaaa )]);
+__PACKAGE__->add_unique_constraint([qw( _8_chr_c _16_chars_column _32_character_column_aaaaaaaaaaa )]);
-__PACKAGE__->add_unique_constraint([qw( 8_char_c 16_character_col 32_character_column_bbbbbbbbbbbb )]);
+__PACKAGE__->add_unique_constraint([qw( _8_chr_c _16_chars_column _32_character_column_bbbbbbbbbbb )]);
-__PACKAGE__->add_unique_constraint([qw( 64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa )]);
+__PACKAGE__->add_unique_constraint([qw( _64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa )]);
__PACKAGE__->belongs_to(
'owner',
'DBICTest::Schema::LongColumns',
{
- 'foreign.lcid' => 'self.64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ 'foreign.lcid' => 'self._64_character_column_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
},
);
@@ -48,8 +48,8 @@
'owner2',
'DBICTest::Schema::LongColumns',
{
- 'foreign.32_character_column_aaaaaaaaaaaa' => 'self.32_character_column_bbbbbbbbbbbb',
- 'foreign.32_character_column_bbbbbbbbbbbb' => 'self.32_character_column_aaaaaaaaaaaa',
+ 'foreign._32_character_column_aaaaaaaaaaa' => 'self._32_character_column_bbbbbbbbbbb',
+ 'foreign._32_character_column_bbbbbbbbbbb' => 'self._32_character_column_aaaaaaaaaaa',
},
);
@@ -57,7 +57,7 @@
'owner3',
'DBICTest::Schema::LongColumns',
{
- 'foreign.8_char_c' => 'self.16_character_col',
+ 'foreign._8_chr_c' => 'self._16_chars_column',
},
);
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-05-07 16:37:56 UTC (rev 4357)
+++ DBIx-Class/0.08/branches/replication_dedux/t/lib/DBICTest/Schema.pm 2008-05-07 21:16:22 UTC (rev 4358)
@@ -45,7 +45,7 @@
sub sqlt_deploy_hook {
my ($self, $sqlt_schema) = @_;
- $sqlt_schema->drop_table('link');
+ $sqlt_schema->drop_table('dummy');
}
1;
More information about the Bast-commits
mailing list