Changeset 1836

Timestamp:

04/10/08 18:23:37 (8 months ago)

Author:

bchoate

Message:

Updates to support expressing meta columns in 'column_defs' structure.
Changes to registry lookup to support handler declarations.
Added meta type aliases for MT type names ('string', 'integer', etc.). BugId:68749

Files:

• branches/feature-narrow-tables/lib/MT.pm.pre (modified) (9 diffs)
• branches/feature-narrow-tables/lib/MT/Asset.pm (modified) (1 diff)
• branches/feature-narrow-tables/lib/MT/Asset/Image.pm (modified) (1 diff)
• branches/feature-narrow-tables/lib/MT/Author.pm (modified) (2 diffs)
• branches/feature-narrow-tables/lib/MT/Blog.pm (modified) (2 diffs)
• branches/feature-narrow-tables/lib/MT/Component.pm (modified) (1 diff)
• branches/feature-narrow-tables/lib/MT/Core.pm (modified) (2 diffs)
• branches/feature-narrow-tables/lib/MT/Entry.pm (modified) (1 diff)
• branches/feature-narrow-tables/lib/MT/Meta.pm (modified) (10 diffs)
• branches/feature-narrow-tables/lib/MT/Meta/Proxy.pm (modified) (5 diffs)
• branches/feature-narrow-tables/lib/MT/Object.pm (modified) (18 diffs)
• branches/feature-narrow-tables/lib/MT/ObjectDriver/DDL/mysql.pm (modified) (1 diff)
• branches/feature-narrow-tables/lib/MT/Template.pm (modified) (2 diffs)
• branches/feature-narrow-tables/lib/MT/Upgrade.pm (modified) (1 diff)
• branches/feature-narrow-tables/t/64-objectmeta.t (modified) (3 diffs)
• branches/feature-narrow-tables/t/plugins/Awesome/config.yaml (modified) (1 diff)
• branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome.pm (modified) (2 diffs)
• branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome/Image.pm (modified) (2 diffs)

branches/feature-narrow-tables/lib/MT.pm.pre

@@ -57 +57 @@
-            no strict 'refs';
-            unless ( defined *{ $compat . '::' } ) {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            }
-        }
@@ -266 +266 @@
-        return $object_types{$k} if exists $object_types{$k};
-
+        if ($k =~ m/^(.+):meta$/) {
+            my $ppkg = $pkg->model($1);
+            my $mpkg = $ppkg->meta_pkg;
+            return $mpkg ? $object_types{$k} = $mpkg : undef;
+        }
+
-        my $model = $pkg->registry( 'object_types', $k );
-        if ( ref($model) eq 'ARRAY' ) {
@@ -286 +292 @@
-        unless ( defined *{ $model . '::__properties' } ) {
-            use strict 'refs';
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            if ( $@ && ( $k =~ m/^(.+)\./ ) ) {
-
@@ -611 +617 @@
-
-    $cb->error();    # reset the error string
-
+
+
+
+
-    if ( my $err = $@ ) {
-        $cb->error($err);
@@ -1250 +1259 @@
-                    $Plugins{$plugin_sig}{full_path} = $plugin_full_path;
-                    $timer->pause_partial if $timer;
-{ require $plugin }
+"# line " . __LINE__ . " " . __FILE__ . "\nrequire '$plugin';"
-                    $timer->mark("Loaded plugin " . $sig) if $timer;
-                    if ($@) {
@@ -1258 +1267 @@
-                        # the database has been initialized...
-                        eval {
+                            # line __LINE__ __FILE__
-                            require MT::Log;
-                            $mt->log(
@@ -2574 +2584 @@
-            if ($method) {
-                return sub {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-                      or Carp::confess(
-                        "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2585 +2595 @@
-            else {
-                return sub {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-                      or Carp::confess(
-                        "failed loading package $hdlr_pkg for routine $name: $@");
@@ -2599 +2609 @@
-        }
-        else {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-              or Carp::confess(
-                "failed loading package $hdlr_pkg for routine $name: $@");

branches/feature-narrow-tables/lib/MT/Asset.pm

@@ -41 +41 @@
-});
-
-__PACKAGE__->install_meta({
-    columns => [],
-});
-
-require MT::Asset::Image;
-require MT::Asset::Audio;

branches/feature-narrow-tables/lib/MT/Asset/Image.pm

@@ -10 +10 @@
-use base qw( MT::Asset );
-
-
-
+
+
+
+
+
+
+
-
-# List of supported file extensions (to aid the stock 'can_handle' method.)

branches/feature-narrow-tables/lib/MT/Author.pm

@@ -37 +37 @@
-        'userpic_asset_id' => 'integer',
-        'basename' => 'string(255)',
+
+        # meta properties
+        'widgets' => 'hash meta',
+        'favorite_blogs' => 'array meta',
-    },
-    defaults => {
@@ -59 +63 @@
-    audit => 1,
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'favorite_blogs',
-        'widgets',
-    ],
-});
-
-sub class_label {

branches/feature-narrow-tables/lib/MT/Blog.pm

@@ -77 +77 @@
-        'archive_tmpl_category' => 'string(255)',
-        'archive_tmpl_individual' => 'string(255)',
+
+        # meta properties
+        'image_default_wrap_text' => 'integer meta',
+        'image_default_align' => 'string meta',
+        'image_default_thumb' => 'integer meta',
+        'image_default_width' => 'integer meta',
+        'image_default_wunits' => 'integer meta',
+        'image_default_constrain' => 'integer meta',
+        'image_default_popup' => 'integer meta',
+        'commenter_authenticators' => 'string meta',
+        'require_typekey_emails' => 'integer meta',
+        'nofollow_urls' => 'integer meta',
+        'follow_auth_links' => 'integer meta',
+        'update_pings' => 'integer meta',
+        'captcha_provider' => 'string meta',
+        'publish_queue' => 'integer meta',
+        'nwc_smart_replace' => 'integer meta',
+        'nwc_replace_field' => 'string meta',
+        'template_set' => 'string meta',
+        'page_layout' => 'string meta',
+        'include_system' => 'integer meta',
+        'include_cache' => 'integer meta',
-    },
-    meta => 1,
@@ -87 +109 @@
-        'custom_dynamic_templates' => 'none',
-    },
-
-
-
-
+
+
+
+
+
+
-    datasource => 'blog',
-    primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'image_default_wrap_text',
-        'image_default_align',
-        'image_default_thumb',
-        'image_default_width',
-        'image_default_wunits',
-        'image_default_constrain',
-        'image_default_popup',
-        'commenter_authenticators',
-        'require_typekey_emails',
-        'nofollow_urls',
-        'follow_auth_links',
-        'update_pings',
-        'captcha_provider',
-        'publish_queue',
-        'nwc_smart_replace',
-        'nwc_replace_field',
-        'template_set',
-        'page_layout',
-        'include_system',
-        'include_cache',
-    ],
-});
-

branches/feature-narrow-tables/lib/MT/Component.pm

@@ -508 +508 @@
-
-                # check for a yaml file reference...
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                    }

branches/feature-narrow-tables/lib/MT/Core.pm

@@ -51 +51 @@
-        object_types   => {
-            'entry'           => 'MT::Entry',
-            'entry_meta'      => 'MT::Entry::Meta',
-            'author'          => 'MT::Author',
-            'author_meta'     => 'MT::Author::Meta',
-            'asset'           => 'MT::Asset',
-            'asset_meta'      => 'MT::Asset::Meta',
-            'file'            => 'MT::Asset',
-            'asset.image'     => 'MT::Asset::Image',
@@ -71 +68 @@
-            'commenter'       => 'MT::Author',
-            'blog'            => 'MT::Blog',
-            'blog_meta'       => 'MT::Blog::Meta',
-            'template'        => 'MT::Template',
-            'template_meta'   => 'MT::Template::Meta',
-            'comment'         => 'MT::Comment',
-            'notification'    => 'MT::Notification',

branches/feature-narrow-tables/lib/MT/Entry.pm

@@ -105 +105 @@
-});
-
-__PACKAGE__->install_meta({
-    columns => [],
-});
-
-sub HOLD ()    { 1 }
-sub RELEASE () { 2 }

branches/feature-narrow-tables/lib/MT/Meta.pm

@@ -16 +16 @@
-# Constants
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-## Specify if the faster REPLACE INTO can be used instead of INSERT/UPDATE
@@ -26 +32 @@
-
-our %Types = (
-
-
-
+
+
+
+
+
+
+
+
+
-);
-
-our %TypesByName = reverse %Types;
+
+# some other aliases
+$TypesByName{string} = TYPE_VCHAR;
+$TypesByName{integer} = TYPE_VINTEGER;
+$TypesByName{datetime} = TYPE_VDATETIME;
+$TypesByName{float} = TYPE_VFLOAT;
+$TypesByName{string_indexed} = TYPE_VCHAR_INDEXED;
+$TypesByName{integer_indexed} = TYPE_VINTEGER_INDEXED;
+$TypesByName{datetime_indexed} = TYPE_VDATETIME_INDEXED;
+$TypesByName{float_indexed} = TYPE_VFLOAT_INDEXED;
+$TypesByName{hash} = TYPE_VBLOB;
+$TypesByName{array} = TYPE_VBLOB;
-
-## $Registry = {
@@ -78 +102 @@
-    my $key = $params->{key};
-    my $inherited = $class->_load_inheritance($pkg, $key);
-
+
+
-    push @$fields, @$inherited;
-
@@ -92 +117 @@
-    
-    ## Assume columns are the default types, if they weren't specified.
-
-
-
-
-
-
-
+# 
+# 
+# 
+# 
+# 
+# 
+# 
-
-    ## build subclass
-    $class->_build_subclass($pkg, $params);
-
-1
+$params->{fields}
-}
-
@@ -129 +154 @@
-            name    => $name,
-            type_id => $type_id,
-type
+Types{$type_id}
-            pkg     => $pkg,
-        };
-        $value->{zip} = $zip if defined $zip;
-
-->{$pkg}->
+{$pkg}
-    }
-}
@@ -147 +172 @@
-    my $class = shift;
-    my($pkg, $name) = @_;
-->
+
-}
-
@@ -156 +181 @@
-    my($pkg)  = @_;
-    my $key   = $pkg->meta_args->{key}; # xxx is it really safe to call meta_args?
-
+
+
+
+
+
+
+
-}
-
@@ -170 +201 @@
-    return [] if $base eq $pkg;
-    my @inherited;
-->
+
-        for my $field ( values %{ $Registry->{$key}->{$base} } ) {
-            push @inherited, $field;
@@ -183 +214 @@
-
-    my $subclass = $pkg->meta_pkg;
-
-
+
+
+
-
-    ## Try to use this subclass first to see if it exists
@@ -203 +235 @@
-    my $base_class = 'MT::Object::Meta';
-
-## no critic ProhibitStringyEval 
-eval
+my $subclass_src = "
+    # line " . __LINE__ . " " . __FILE__ .
-        package $subclass;
+        our \$VERSION = 1.0;
-        use base qw($base_class);
-        1;
-
+
+
+
+
-
-    $subclass->install_properties($meta);

branches/feature-narrow-tables/lib/MT/Meta/Proxy.pm

@@ -16 +16 @@
-$HAS_ZLIB = 1 unless $@;
-
-Storable
+MT
-
-sub new {
@@ -63 +63 @@
-
-    $proxy->lazy_load_objects;
+
-    if (exists $proxy->{__objects}->{$col}) {
-        my $pkg  = $proxy->{pkg};
@@ -71 +72 @@
-        my $type = $field->{type}
-            or Carp::croak("$col not found on $pkg meta fields");
-
+
-        unless ($meta->has_column($type)) {
-            Carp::croak("something is wrong: $type not in column_values of metadata");
@@ -80 +81 @@
-        return undef;
-    }
+}
+
+sub get_hash {
+    my $proxy = shift;
+    my ($col) = @_;
+
+    $proxy->lazy_load_objects;
+
+    my $collection = {};
+
+    foreach my $name (keys %{ $proxy->{__objects} }) {
+        $collection->{$name} = $proxy->get($name);
+    }
+
+    return $collection;
+}
+
+sub get_collection {
+    my $proxy = shift;
+    my ($col) = @_;
+
+    $proxy->lazy_load_objects;
+
+    my $collection = {};
+
+    foreach my $name (keys %{ $proxy->{__objects} }) {
+        if ($name =~ m/^\Q$col\E\.(.+)$/) {
+            my $suffix = $1;
+            $collection->{$suffix} = $proxy->get($name);
+        }
+    }
+
+    return $collection;
-}
-
@@ -226 +260 @@
-        my $type  = $field->{type};
-
-
+
+
-        $proxy->{__objects}->{$name} = $meta_obj;
-    }

branches/feature-narrow-tables/lib/MT/Object.pm

@@ -53 +53 @@
-    }
-
+    my %meta;
+
-    my $super_props = $class->SUPER::properties();
+    $props->{meta} = 1 if $super_props && $super_props->{meta};
+
+    if ($props->{meta}) {
+        # yank out any meta columns before we start working on column_defs
+        $meta{$_} = delete $props->{column_defs}{$_}
+            for grep { $props->{column_defs}{$_} =~ m/\bmeta\b/ }
+            keys %{ $props->{column_defs} };
+    }
+
-    if ($super_props) {
-        # subclass; merge hash
@@ -81 +92 @@
-    # Legacy MT::Object types only define 'columns'; we still support that
-    # but they aren't handled properly with the upgrade system as a result.
-
-
-
+
-        map { $props->{column_defs}{$_} = () } @{ $props->{columns} };
-    }
+    $props->{columns} = [ keys %{ $props->{column_defs} } ];
-
-    # Support audit flags
@@ -139 +149 @@
-        foreach my $isa_class (@classes) {
-            next if UNIVERSAL::isa($class, $isa_class);
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            no strict 'refs'; ## no critic
-            push @{$class . '::ISA'}, $isa_class;
@@ -148 +158 @@
-            for my $name (keys %$cols) {
-                next if exists $props->{column_defs}{$name};
+                if ($cols->{$name} =~ m/\bmeta\b/) {
+                    $meta{$name} = $cols->{$name};
+                    next;
+                }
+
-                $class->install_column($name, $cols->{$name});
-                $props->{indexes}{$name} = 1
@@ -211 +226 @@
-
-    # inherit parent's metadata setup
-
-
+
+
+
-    }
-
@@ -327 +343 @@
-            return $package;
-        } else {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            return $package unless $@;
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-            return $package unless $@;
-        }
@@ -376 +392 @@
-    }
-
+    require MT::Meta;
-    my $pkg = ref $class || $class;
-    if (!$pkg->SUPER::properties->{meta_installed}) {
@@ -382 +399 @@
-    }
-
-
+
+
+
-        return $class->error('No meta fields specified to install_meta');
-    }
@@ -388 +407 @@
-    $params->{fields} ||= [];
-    if (my $cols = delete $params->{columns}) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -404 +452 @@
-        key         => $class->datasource,
-        column_defs => {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        },
+        columns => [ $id_field, qw(
+            type
+            vchar
+            vchar_indexed
+            vdatetime
+            vdatetime_indexed
+            vinteger
+            vinteger_indexed
+            vfloat
+            vfloat_indexed
+            vblob
+        ) ],
-        indexes => {
-            $id_field => 1,
-            id_type   => { columns => [ $id_field, 'type' ] },
-
+
+
+
+
+
+
+
-        },
-        primary_key => [ $class->datasource . '_id', 'type' ],
@@ -435 +507 @@
-sub is_meta_column {
-    my $obj = shift;
-    return if !$obj->properties->{meta_installed};
-    my ($field) = @_;
-
+    my $props = $obj->properties;
+    return unless $props->{meta_installed};
+
-    my $meta = $obj->meta_pkg;
-
+
+
-    return;
-}
@@ -445 +520 @@
-sub meta_pkg {
-    my $class = shift;
+    my $props = $class->properties;
+    return unless $props->{meta}; # this only works for meta-enabled classes
+
+    return $props->{meta_pkg} if $props->{meta_pkg};
+
-    my $meta = ref $class || $class;
-    $meta .= '::Meta';
-
+props->{meta_pkg} = $
-}
-
@@ -472 +552 @@
-         : 2 == scalar @_  ? $obj->{__meta}->set($name, $value)
-         : 1 == scalar @_  ? $obj->{__meta}->get($name)
-Carp::croak('TODO: implement returning a metadata hash')
+$obj->{__meta}->get_hash
-         ;
+}
+
+sub meta_obj {
+    my $obj = shift;
+    return $obj->{__meta};
-}
-
@@ -848 +933 @@
-}
-
+sub remove_meta {
+    my $obj = shift;
+    return 1 unless ref $obj;
+    my $mpkg = $obj->meta_pkg or return;
+    my $id_field = $obj->datasource . '_id';
+    return $mpkg->remove({ $id_field => $obj->id });
+}
+
-sub remove_children {
-    my $obj = shift;
@@ -861 +954 @@
-    my $obj_id = $obj->id;
-    for my $class (@classes) {
-
+# line " . __LINE__ . " " . __FILE__ . "\n
-        $class->remove({ $key => $obj_id });
-    }
@@ -970 +1063 @@
-    $def{key} = 1 if ($props->{primary_key}) && ($props->{primary_key} eq $col);
-    $def{auto} = 1 if $def =~ m/\bauto[_ ]increment\b/i;
-
+
+
-    \%def;
-}
@@ -1050 +1144 @@
-}
-
+sub meta_pkg { undef }
+
-*table_name = \&MT::Object::table_name;
-*column_defs = \&MT::Object::column_defs;
@@ -1056 +1152 @@
-*__parse_defs = \&MT::Object::__parse_defs;
-*__parse_def = \&MT::Object::__parse_def;
+*count = \&MT::Object::count;
-
-# TODO: copy this too

branches/feature-narrow-tables/lib/MT/ObjectDriver/DDL/mysql.pm

@@ -22 +22 @@
-    my $field_prefix = $class->datasource;
-    my $table_name = $class->table_name;
+    local $dbh->{RaiseError} = 0;
-    my $sth = $dbh->prepare('SHOW INDEX FROM ' . $table_name)
-        or return undef;

branches/feature-narrow-tables/lib/MT/Template.pm

@@ -35 +35 @@
-        'build_type' => 'smallint',
-        'build_interval' => 'integer',
+
+        # meta properties
+        'last_rebuild_time' => 'integer meta',
+        'page_layout' => 'string meta',
+        'include_with_ssi' => 'integer meta',
-    },
-    indexes => {
@@ -54 +59 @@
-    datasource => 'template',
-    primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [
-        'last_rebuild_time',
-        'page_layout',
-        'include_with_ssi',
-    ],
-});
-__PACKAGE__->add_trigger('pre_remove' => \&pre_remove_children);

branches/feature-narrow-tables/lib/MT/Upgrade.pm

@@ -1316 +1316 @@
-        }
-    }
+
+    # handle schema updates for meta table
+    if ($class->meta_pkg) {
+        $self->check_type($type . ':meta');
+    }
+
-    1;
-}

branches/feature-narrow-tables/t/64-objectmeta.t

@@ -5 +5 @@
-
-use Data::Dumper;
-18
+26
-
-use MT;
@@ -17 +17 @@
-require MT::Awesome;
-require MT::Awesome::Image;
+
-my $file  = MT::Awesome->new;
-my $image = MT::Awesome::Image->new;
@@ -52 +53 @@
-ok($image->has_meta('width'), 'subclass has metadata field that was declared for subclass');
-ok($image->has_meta('mime_type'), 'subclass has metadata field that was declared for superclass');
+ok($image->mime_type('image/jpeg'), 'subclass object mime type set');
+ok($image->save(), 'image object saved');
-
+ok($image->id, 'image object with metadata received id when saved');
+
+my $image_2 = MT::Awesome->load($image->id);
+ok($image_2, 'subclass object could be loaded');
+is($image_2->mime_type, 'image/jpeg', 'metadata value as retrieved with auto-installed method is correct on loaded image object');
+
+ok(MT::Asset::Image->has_meta('image_width'), 'MT::Asset::Image has an image_width meta column.');
+ok(MT::Entry->has_meta, 'MT::Entry has a meta support.');
+ok(MT::Page->has_meta, 'MT::Page has a meta support.');
+

branches/feature-narrow-tables/t/plugins/Awesome/config.yaml

@@ -4 +4 @@
-
-object_types:
-    blog_meta:     MT::Blog::Meta
-    awesome:       MT::Awesome
-    awesome_meta:  MT::Awesome::Meta
-    awesome_image: MT::Awesome::Image
-

branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome.pm

@@ -9 +9 @@
-        title => 'string(255)',
-        file => 'string(255)',
+        mime_type => 'string meta',
-    },
-    meta => 1,
@@ -15 +16 @@
-    primary_key => 'id',
-});
-__PACKAGE__->install_meta({
-    columns => [ 'mime_type' ]
-});
-
-1;

branches/feature-narrow-tables/t/plugins/Awesome/lib/MT/Awesome/Image.pm

@@ -1 @@
-
-package MT::Awesome::Image;
-
@@ -6 +5 @@
-__PACKAGE__->install_properties({
-    class_type => 'image',
-
-
-
+
+
+
+
-});
-