[Jifty-commit] r3607 - in Jifty-DBI/trunk: . lib/Jifty/DBI
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Jul 4 14:09:05 EDT 2007
Author: jesse
Date: Wed Jul 4 14:09:00 2007
New Revision: 3607
Modified:
Jifty-DBI/trunk/ (props changed)
Jifty-DBI/trunk/Changes
Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm
Jifty-DBI/trunk/t/10schema.t
Jifty-DBI/trunk/t/testmodels.pl
Log:
r59839 at pinglin: jesse | 2007-07-04 09:47:35 -0400
* Basic updates t6 work with the new DBIx::DBSchema ::Index support
Modified: Jifty-DBI/trunk/Changes
==============================================================================
--- Jifty-DBI/trunk/Changes (original)
+++ Jifty-DBI/trunk/Changes Wed Jul 4 14:09:00 2007
@@ -1,5 +1,7 @@
Revision history for Perl extension Jifty::DBI.
+ * Updated for deprecated API in DBIx::DBSchema 0.33
+
0.41 Mon Apr 16 16:16:12 EDT 2007
* Fixed a broken dependency. Thanks to SAPER
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm Wed Jul 4 14:09:00 2007
@@ -292,11 +292,12 @@
}
}
+ my $index_count = 1;
my $table = DBIx::DBSchema::Table->new(
{ name => $table_name,
primary_key => "id",
columns => \@cols,
- (@indexes) ? (index => DBIx::DBSchema::ColGroup->new(\@indexes)) : ()
+ (@indexes) ? (indices => [map {DBIx::DBSchema::Index->new(name => $table_name.$index_count++, columns => $_) } @indexes]) : ()
}
);
Modified: Jifty-DBI/trunk/t/10schema.t
==============================================================================
--- Jifty-DBI/trunk/t/10schema.t (original)
+++ Jifty-DBI/trunk/t/10schema.t Wed Jul 4 14:09:00 2007
@@ -132,13 +132,17 @@
}
sub is_ignoring_space {
- my $a = shift;
- my $b = shift;
-
- $a =~ s/^\s+//; $a =~ s/\s+$//; $a =~ s/\s+/ /g;
- $b =~ s/^\s+//; $b =~ s/\s+$//; $b =~ s/\s+/ /g;
-
- unshift @_, $b; unshift @_, $a;
-
- goto &is;
+ my $a = shift;
+ my $b = shift;
+
+ for my $item ( $b, $a ) {
+ $item =~ s/^\s+//;
+ $item =~ s/\s+$//;
+ $item =~ s/\s+/ /g;
+ $item =~ s/\s+;/;/g;
+ $item =~ s/\(\s+(.*?)\s+\)/($1)/g;
+
+ unshift @_, $item;
+ }
+ goto &is;
}
Modified: Jifty-DBI/trunk/t/testmodels.pl
==============================================================================
--- Jifty-DBI/trunk/t/testmodels.pl (original)
+++ Jifty-DBI/trunk/t/testmodels.pl Wed Jul 4 14:09:00 2007
@@ -14,7 +14,7 @@
sub schema_sqlite {
return q{
CREATE TABLE employees (
- id INTEGER PRIMARY KEY NOT NULL ,
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL ,
dexterity integer ,
name varchar ,
label varchar ,
@@ -73,7 +73,7 @@
sub schema_sqlite {
return q{
CREATE TABLE addresses (
- id INTEGER PRIMARY KEY NOT NULL ,
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL ,
employee_id integer ,
name varchar DEFAULT 'Frank' ,
phone varchar
@@ -84,7 +84,7 @@
sub schema_sqlite_024 {
return q{
CREATE TABLE addresses (
- id INTEGER PRIMARY KEY NOT NULL ,
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL ,
employee_id integer ,
name varchar DEFAULT 'Frank' ,
phone varchar ,
More information about the Jifty-commit
mailing list