Changeset 2311 for branches/release-37

Timestamp:

05/12/08 23:21:43 (6 months ago)

Author:

bchoate

Message:

Backport of SQLite fixes for upgrading metadata column to narrow tables. BugId:79719,79720

Files:

• branches/release-37/lib/MT/Upgrade.pm (modified) (12 diffs)

branches/release-37/lib/MT/Upgrade.pm

@@ -888 +888 @@
-        },
-
-
+s
-        # and possibly other object types that require
-        # this migration; version_limit is unspecified, so
-is
-it
+ese
+them
-        'core_upgrade_meta_for_table' => {
-3.3
+1.5
-            code => \&core_upgrade_meta_for_table,
+        },
+        'core_drop_meta_for_table' => {
+            priority => 3.4,
+            code => \&core_drop_meta_for_table,
-        },
-        'core_replace_file_template_format' => {
@@ -925 +929 @@
-        next TYPE if !$class->has_meta();  # nothing to upgrade
-
-
-
+
-        my $class_type = $class->properties->{class_type};
-        if ($class_type && $class_type ne $class->datasource) {
+            $t = $class_type;
-            if (my $super_class = MT->model($class->datasource)) {
-                $class = $super_class
@@ -935 +939 @@
-            # If there's no appropriate superclass, go to update with the class
-            # we have, not the class we want.
-
-
-
-
+
+
+
+
+
+
+
+
+
-        $step_param{meta_column} = $class->properties->{meta_column}
-            if $class->properties->{meta_column};
-        $self->add_step('core_upgrade_meta_for_table', %step_param);
-->datasource
+
-    }
-    return 0;
@@ -1017 +1026 @@
-    my $pid = join q{:}, $param{step} . "_type", $class;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    my $dbh = $driver->rw_handle;
-    my $dbd = $driver->dbd;
@@ -1029 +1047 @@
-
-    my $ddl = $driver->dbd->ddl_class;
-
+db_
-    return 0 unless $db_defs && exists($db_defs->{$meta_col});
-
@@ -1046 +1064 @@
-    $sth->execute
-        or return $self->error($dbh->errstr || $DBI::errstr);
+
+    my $msg = $self->translate_escape("Upgrading metadata storage for [_1]", $class->class_label_plural);
-
-    if (!$offset) {
@@ -1070 +1090 @@
-            if ($metadataref) {
-                my $metadata = $$metadataref;
-$id
+ { id => $id }, { no_class => 1, fetchonly => [ 'id', ( $class_type ? ( $class->properties->{class_column} ) : () ) ] }
-                if ($obj) {
-                    my $changed = 0;
@@ -1084 +1104 @@
-                            foreach my $cfname (keys %$cfdata) {
-                                my $cfvalue = $cfdata->{$cfname};
+                                my $cftype = $type;
+                                if ($class_type) {
+                                    $cftype = $obj->class_type;
+                                }
+
-                                # make sure CustomFields::Field exists
- ||= $cfclass->load({ basename => $cfname, obj_type => $
+{$cftype} ||= $cfclass->load({ basename => $cfname, obj_type => $cf
-                                next unless $fld;
-
@@ -1121 +1146 @@
-    } else {
-        # done, so lets drop that meta column, what say you?
-
-
+
+
+
+
+
+
+
+
-        $self->progress($msg . ' (100%)', $pid);
-        $offset = 0;  # done!
-    }
-    return $offset;
+}
+
+sub core_drop_meta_for_table {
+    my $self = shift;
+    my (%param) = @_;
+    my $class = $param{class};
+    my $sql = $param{sql};
+
+    eval "require $class;";
+    my $driver = $class->dbi_driver;
+    my $dbh = $driver->rw_handle;
+    $dbh->do($sql);
+
+    return 0;
-}
-
@@ -1586 +1631 @@
-
-    my $class = MT->model($type);
+
+    # handle schema updates for meta table
+    if ($class->meta_pkg) {
+        $self->check_type($type . ':meta');
+    }
+
-    if (my $result = $self->type_diff($type)) {
-        if ($result->{fix}) {
@@ -1599 +1650 @@
-                if $result->{index};
-        }
-    }
-
-    # handle schema updates for meta table
-    if ($class->meta_pkg) {
-        $self->check_type($type . ':meta');
-    }
-
@@ -2113 +2159 @@
-# if they require processing that will take time to complete.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-sub pre_alter_column { 1 }
-sub post_alter_column { 1 }