Changeset 2881

Timestamp:

08/01/08 21:38:08 (4 months ago)

Author:

mpaschal

Message:

Treat multi-column primary keys correctly when generating table SQL on core databases
BugzID: 80847

Files:

• branches/release-42/lib/MT/ObjectDriver/DDL.pm (modified) (6 diffs)
• branches/release-42/lib/MT/ObjectDriver/DDL/SQLite.pm (modified) (5 diffs)
• branches/release-42/lib/MT/ObjectDriver/DDL/mysql.pm (modified) (1 diff)

branches/release-42/lib/MT/ObjectDriver/DDL.pm

@@ -28 +28 @@
-sub create_sequence {}
-sub drop_sequence {}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-sub table_exists {
@@ -258 +272 @@
-    my @stmts;
-    if ($indexes) {
-        # FIXME: Handle possible future primary key tuple case
-        my $pk = $props->{primary_key};
+        undef $pk if ref $pk;  # ignore complex key
-        foreach my $name (keys %$indexes) {
-            next if $pk && $name eq $pk;
@@ -283 +297 @@
-    my $pk = $props->{primary_key};
-    if (!ref $indexes->{$name}) {
-($pk && $name eq $pk)
+$pk || ref $pk || $name ne $pk
-            push @stmts, "CREATE INDEX ${table_name}_$name ON $table_name (${field_prefix}_$name)";
-        }
@@ -362 +376 @@
-        $default = ' DEFAULT ' . $value;
-    }
-
-
+
+
+
+
-    return $field_prefix . '_' . $name . ' ' . $type . $nullable . $default . $key;
-}
@@ -430 +446 @@
-=head1 NAME
-
-
-
-
+
-
-=head1 SYNOPSIS
@@ -443 +457 @@
-    my @ddl = $ddl->as_ddl;
-
+=head1 DESCRIPTION
+
+The Data Definition Language (DDL) drivers provide compatible SQL for creating
+and changing the database tables that contain Movable Type's data. The DDL
+drivers are mainly used by MT::Upgrade, the automatic upgrader.
+
-=head1 METHODS
-
+=head2 $ddl->column_defs($class)
+
+Returns a description of the current column definitions in the table holding
+records for C<$class>, an C<MT::Object> subclass. These descriptions are
+comparable to the results of C<MT::Object::column_defs()>; that is, the
+description for a class is a hashref containing a column definition for each
+column of the class, keyed on the name of the column. Each column definition is
+itself a hashref with the possible keys:
+
+=over 4
+
+=item * C<type>
+
+The type of data contained in the column. See C<db2type()> for the possible
+values of this member.
+
+=item * C<auto>
+
+If true, indicates the column is an auto-increment column (that is, a column
+automatically filled by the database when no value is provided for new
+records).
+
+=item * C<key>
+
+If true, indicates the column is or is part of the table's primary key. The
+combined value of all key columns in a record must be unique, and should
+constitute the identity of the record.
+
+=item * C<size>
+
+For string columns, the maximum possible length of values in the column.
+
+=item * C<not_null>
+
+If true, indicates the column is not allowed to contain a C<NULL> value.
+
+=item * C<default>
+
+The default value used if a record is sent to be saved with no value for that
+column.
+
+=back
+
+If the table does not exist, no value is returned.
+
+Subclasses B<must> themselves implement C<column_defs()>. No default
+implementation is provided.
+
+=head2 $ddl->index_defs($class)
+
+Returns a description of all the index definitions for the table storing
+records for C<$class>, an C<MT::Object> subclass. These descriptions are
+hashrefs containing individual index definitions, keyed on the names of the
+indexes.
+
+Each index definition is either C<1>, meaning the index is on the single column
+named the same as the index, or a hashref with the possible keys:
+
+=over 4
+
+=item * C<columns>
+
+An arrayref listing the columns that compose the index.
+
+=item * C<unique>
+
+If true, indicates a record's values for the indexes are required to be unique
+across the table.
+
+=back
+
+If no indexes exist for the table, either no value or an empty hashref is
+returned.
+
+=head2 $ddl->table_exists($class)
+
+Returns whether the table for C<$class>, an C<MT::Object> subclass, exists in
+the database.
+
+=head2 $ddl->unique_constraint_sql($class)
+
+Returns the SQL describing the uniqueness constraints specified in the
+properties of C<$class>, an C<MT::Object> subclass, suitable for insertion at
+the end of a C<CREATE TABLE> statement.
+
+The default implementation returns a standard multi-column C<PRIMARY KEY>
+declaration if the primary key of C<$class> is multiple columns, or the empty
+string otherwise.
+
+=head2 $ddl->can_add_column()
+
+Returns whether the database can add columns to a table that already exists.
+
+The default implementation returns false. Subclasses should override this
+method to return true if they implement C<add_column_sql()>.
+
+=head2 $ddl->can_drop_column()
+
+Returns whether the database can drop (remove) columns from a table that
+already exists.
+
+The default implementation returns false. Subclasses should override this
+method to return true if they implement C<drop_column_sql()>.
+
+=head2 $ddl->can_alter_column()
+
+Returns whether the database can change the definition of a column that already
+exists.
+
+The default implementation returns false. Subclasses should override this
+method to return true if they implement C<alter_column_sql()>.
+
+=head2 $ddl->can_add_constraint()
+
+Returns whether the database can add a constraint on the table that already
+exists.
+
+The default implementation returns B<true>. Subclasses should override this
+method to return B<false> if the database does not support the C<ALTER TABLE
+... ADD CONSTRAINT> statement.
+
+=head2 $ddl->fix_class()
+
+=head2 $ddl->insert_from_sql()
+
+=head2 $ddl->drop_table_sql()
+
+=head2 $ddl->drop_index_sql()
+
+=head2 $ddl->create_table_sql()
+
+=head2 $ddl->create_table_as_sql()
+
+=head2 $ddl->index_table_sql()
+
+=head2 $ddl->index_column_sql()
+
+=head2 $ddl->add_column_sql()
+
+=head2 $ddl->alter_column_sql()
+
+=head2 $ddl->drop_column_sql()
+
+=head2 $ddl->column_sql()
+
+=head2 $ddl->cast_column_sql()
+
+=head2 $ddl->db2type()
+
+=head2 $ddl->type2db()
+
+TODO
+
-=head2 $ddl->add_column()
-
+=head2 $ddl->alter_column()
+
+=head2 $ddl->drop_column()
+
+=head2 $ddl->index_column()
+
+B<Deprecated.> These methods return the results of the corresponding C<_sql>
+methods.
+
-=head2 $ddl->create_table()
-
-=head2 $ddl->drop_table()
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-=head1 AUTHOR & COPYRIGHT

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

@@ -101 +101 @@
-    $sth->execute or return undef;
-    my $defs = {};
+    my @pks;
-    while (my $row = $sth->fetchrow_hashref) {
-        my $colname = lc $row->{name};
@@ -109 +110 @@
-        }
-        $defs->{$colname}{type} = $coltype;
+        # TODO: isn't key for pks, not foreign keys?
-        if ($colname =~ m/_id$/) {
-            $defs->{$colname}{key} = 1;
-        }
-
-
+
-            $defs->{$colname}{key} = 1;
-$defs->{$colname}{auto} = 1
+push @pks, $colname
-        }
-        $defs->{$colname}{not_null} = 1
@@ -124 +125 @@
-    $sth->finish;
-    return undef unless %$defs;
+
+    if (@pks && 1 == scalar @pks) {
+        my ($colname) = @pks;
+        if ($defs->{$colname}{type} eq 'integer') {
+            # with sqlite, simple integer primary keys auto increment. always.
+            $defs->{$colname}{auto} = 1;
+        }
+    }
+
-    return $defs;
-}
@@ -173 +183 @@
-    my ($class) = @_;
-
-
-
+  
+       
-    my $field_prefix = $class->datasource;
-
+
+
-
-    my @stmts;
-    if ($indexes) {
-        # FIXME: Handle possible future primary key tuple case
-        my $pk = $props->{primary_key};
-        foreach my $name (keys %$indexes) {
-            next if $pk && $name eq $pk;
@@ -199 +208 @@
-        }
-    }
+    if ($pk && 'ARRAY' eq ref $pk) {
+        my @columns = map { join q{_}, $field_prefix, $_ } @$pk;
+        my $columns = join q{, }, @columns;
+        push @stmts, "PRIMARY KEY ($columns)";
+    }
-    if (@stmts) {
-        return ',' . join("\n", @stmts);

branches/release-42/lib/MT/ObjectDriver/DDL/mysql.pm

@@ -97 +97 @@
-        $defs->{$colname}{type} = $coltype;
-        $defs->{$colname}{auto} = ($row->{Extra} =~ m/auto_increment/i) ? 1 : 0;
+        $defs->{$colname}{key}  = $row->{Key} eq 'PRI' ? 1 : 0;
-        if (($coltype eq 'string') && $size) {
-            $defs->{$colname}{size} = $size;