Changeset 2705

Timestamp:

07/03/08 23:42:42 (12 months ago)

Author:

bchoate

Message:

Added support for determining autoincrement/nullable columns for sqlite's DDL module.

Location:

branches/release-41

Files:

• lib/MT/ObjectDriver/DDL/SQLite.pm (modified) (4 diffs)
• t/ddl-tests.pl (modified) (3 diffs)

branches/release-41/lib/MT/ObjectDriver/DDL/SQLite.pm

@@ -90 +90 @@
     my $table_name = $class->table_name;
     my $field_prefix = $class->datasource;
-    my $props = $class->properties;
-    my $obj_defs = $class->column_defs;
 
     return undef unless $dbh;
@@ -98 +96 @@
     # may not actually exist (in which case, the return value is undef,
     # signalling an nonexistent table to the caller).
-    local $dbh->{RaiseError} = 0;
-    my $sth = $dbh->prepare('SELECT * FROM ' . $table_name . ' LIMIT 1')
+    local $dbh->{RaiseError} = 1;
+    my $sth = $dbh->prepare('PRAGMA table_info("' . $table_name . '")')
         or return undef;
     $sth->execute or return undef;
-    my $fields = $sth->{'NUM_OF_FIELDS'};
-    my $coltypes = $sth->{'TYPE'};
-    my $name = $sth->{'NAME'};
-    my $null = $sth->{'NULLABLE'};
-    #my $skip_null_checks;
-    #if (!$null || !@$null) {
-    #    $skip_null_checks = 1;
-    #}
     my $defs = {};
-    foreach (my $col = 0; $col < $fields; $col++) {
-        my $colname = lc $name->[$col];
+    while (my $row = $sth->fetchrow_hashref) {
+        my $colname = lc $row->{name};
         $colname =~ s/^\Q$field_prefix\E_//i;
-        my $coltype = $ddl->db2type($coltypes->[$col]);
-        if ($coltypes->[$col] =~ m/\((\d+)\)/) {
+        my $coltype = $ddl->db2type($row->{type});
+        if ($row->{type} =~ m/\((\d+)\)/) {
             $defs->{$colname}{size} = $1;
         }
@@ -122 +112 @@
             $defs->{$colname}{key} = 1;
         }
-        if ( $coltype eq 'integer' && $defs->{$colname}{key} ) {
+        if ( ($coltype eq 'integer') && $row->{pk} ) {
             # with sqlite, integer primary keys auto increment. always.
+            $defs->{$colname}{key} = 1;
             $defs->{$colname}{auto} = 1;
         }
-        #if ($skip_null_checks) {
-        if ( exists $obj_defs->{$colname} ) {
-            $defs->{$colname}{not_null} = $obj_defs->{$colname}{not_null};
-        }
-        #} else {
-        #    if ( (defined $null->[$col]) && ($null->[$col] == 0) ) {
-        #        $defs->{$colname}{not_null} = 1;
-        #    }
-        #}
+        $defs->{$colname}{not_null} = 1
+            if $row->{notnull};
+        $defs->{$colname}{default} = $row->{dflt_value}
+            if defined $row->{dflt_value};
     }
     $sth->finish;
+    return undef unless %$defs;
     return $defs;
 }
@@ -153 +140 @@
     my $ddl = shift;
     my ($def) = @_;
+    return undef if !defined $def;
     my $type = (ref($def) eq 'HASH') ? $def->{type} : $def;
+    $type = $def->{type};
     if ($type eq 'string') {
-        $type = 'varchar(' . $def->{size} . ')';
-    }
-    return $type;
+        return 'varchar(' . $def->{size} . ')';
+    } elsif ($type eq 'smallint' ) {
+        return 'smallint';
+    } elsif ($type eq 'bigint' ) {
+        return 'bigint';
+    } elsif ($type eq 'boolean') {
+        return 'boolean';
+    } elsif ($type eq 'datetime') {
+        return 'datetime';
+    } elsif ($type eq 'timestamp') {
+        return 'timestamp';
+    } elsif ($type eq 'integer') {
+        return 'integer';
+    } elsif ($type eq 'blob') {
+        return 'blob';
+    } elsif ($type eq 'text') {
+        return 'text';
+    } elsif ($type eq 'float') {
+        return 'float';
+    }
+    Carp::croak("undefined type: ". $type);
 }
 

branches/release-41/t/ddl-tests.pl

@@ -112 +112 @@
     my $self = shift;
 
-    $self->init_testdb();
-
     my $driver    = MT::Object->dbi_driver;
     my $dbh       = $driver->rw_handle;
@@ -312 +310 @@
     ok($defs->{baz}, 'Ddltest::Fixable table has baz column after creation');
 
-    my $sql = $ddl_class->drop_column_sql('Ddltest::Fixable', 'baz');
-    ok($sql, 'Ddltest::Fixable can have column dropping sql');
-    my $res = $dbh->do($sql);
-    ok($res, 'Ddltest::Fixable could have its column dropped');
+    my $sql;
+    my $res;
+
+    SKIP: {
+        skip("Driver cannot drop columns", 2) unless $ddl_class->can_drop_column;
+        $sql = $ddl_class->drop_column_sql('Ddltest::Fixable', 'baz');
+        ok($sql, 'Ddltest::Fixable can have column dropping sql');
+        $res = $dbh->do($sql);
+        ok($res, 'Ddltest::Fixable could have its column dropped');
+    }
 
     {
@@ -327 +331 @@
 
     $defs = $ddl_class->column_defs('Ddltest::Fixable');
-    ok(!$defs->{baz},  'Ddltest::Fixable did indeed have a column dropped');
+    SKIP: {
+        skip("Driver cannot drop columns", 1) unless $ddl_class->can_drop_column;
+        ok(!$defs->{baz},  'Ddltest::Fixable did indeed have a column dropped');
+    }
     ok( $defs->{borf}, 'Ddltest::Fixable did indeed have a column added');