projects
/
DBIx-DBSchema.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67e4411
)
tiny bit of cleanup
author
ivan
<ivan>
Mon, 28 Nov 2005 13:18:35 +0000
(13:18 +0000)
committer
ivan
<ivan>
Mon, 28 Nov 2005 13:18:35 +0000
(13:18 +0000)
DBSchema/Column.pm
patch
|
blob
|
history
DBSchema/Table.pm
patch
|
blob
|
history
diff --git
a/DBSchema/Column.pm
b/DBSchema/Column.pm
index
363c98c
..
6c55735
100644
(file)
--- a/
DBSchema/Column.pm
+++ b/
DBSchema/Column.pm
@@
-277,7
+277,7
@@
sub line {
if ( $driver eq 'mysql' ) { #yucky mysql hack
$null ||= "NOT NULL";
$self->local('AUTO_INCREMENT') if uc($self->type) eq 'SERIAL';
if ( $driver eq 'mysql' ) { #yucky mysql hack
$null ||= "NOT NULL";
$self->local('AUTO_INCREMENT') if uc($self->type) eq 'SERIAL';
- } elsif ( $driver =~ /^(?:Pg|SQLite)$/ ) { #yucky Pg hack
+ } elsif ( $driver =~ /^(?:Pg|SQLite)$/ ) { #yucky Pg
/SQLite
hack
$null ||= "NOT NULL";
$null =~ s/^NULL$//;
}
$null ||= "NOT NULL";
$null =~ s/^NULL$//;
}
diff --git
a/DBSchema/Table.pm
b/DBSchema/Table.pm
index
70b2cdf
..
0fa0bbf
100644
(file)
--- a/
DBSchema/Table.pm
+++ b/
DBSchema/Table.pm
@@
-391,10
+391,7
@@
sub sql_create_table {
my @columns = map { $self->column($_)->line($dbh) } $self->columns;
push @columns, "PRIMARY KEY (". $self->primary_key. ")"
my @columns = map { $self->column($_)->line($dbh) } $self->columns;
push @columns, "PRIMARY KEY (". $self->primary_key. ")"
- #if $self->primary_key && $driver ne 'Pg';
- # SQLite needs to declare its autoincrementing columns as PRIMARY KEYS inline
- # otherwise they have no magic
- if ($self->primary_key and not ( grep { /PRIMARY KEY/ } @columns));
+ if $self->primary_key && ! grep /PRIMARY KEY/i, @columns;
my $indexnum = 1;
my $indexnum = 1;