From: ivan <ivan>
Date: Mon, 28 Nov 2005 13:18:35 +0000 (+0000)
Subject: tiny bit of cleanup
X-Git-Tag: DBIx_DBSchema_0_28~1
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=1b1a04b42761d1d8a6f9c61c13d86add4ee7a1e3;p=DBIx-DBSchema.git

tiny bit of cleanup
---

diff --git a/DBSchema/Column.pm b/DBSchema/Column.pm
index 363c98c..6c55735 100644
--- 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';
-  } elsif ( $driver =~ /^(?:Pg|SQLite)$/ ) { #yucky Pg hack
+  } elsif ( $driver =~ /^(?:Pg|SQLite)$/ ) { #yucky Pg/SQLite hack
     $null ||= "NOT NULL";
     $null =~ s/^NULL$//;
   }
diff --git a/DBSchema/Table.pm b/DBSchema/Table.pm
index 70b2cdf..0fa0bbf 100644
--- 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. ")"
-    #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;