php.activerecord

Subject: Better support of Namespace for Model

Hi,
I found some problems with using namespace models.
This is the changes I made ​​to resolve these problems.
I assume that models will always be in the same namespace.

(I'm using the 2011/02/28 nightly build)

--

Add this into ActiveRecord\Config :

private $model_namespace = '\\';

public function set_model_namespace($namespace) {
    $this->model_namespace = '\\' . trim($namespace, '\\') . '\\';
}

public function get_model_namespace() {
    return $this->model_namespace;
}

Now, we can set namespace in configuration like that :

ActiveRecord\Config::initialize(function($cfg) use ($connections) {
    $cfg->set_model_namespace('\app\models');
    $cfg->set_connections(connections);
});

--

Update ActiveRecord\Reflections::get_class() :

private function get_class($mixed=null)
{
// Start modification
    if (is_string($mixed) && strpos($mixed, '\\') === false) {
        $config = Config::instance();
        return $config->get_model_namespace() . $mixed;
    }
// End modification

    if (is_object($mixed))
        return get_class($mixed);

    if (!is_null($mixed))
        return $mixed;

    return $this->get_called_class();
}

--

Update ActiveRecord\AbstractRelationship::set_class_name() :

protected function set_class_name($class_name)
{
// Start modification
    if (strpos($class_name, '\\') === false) {
        $config = Config::instance();
        $class_name = $config->get_model_namespace() . $class_name;
    }
// End modification

    $reflection = Reflections::instance()->add($class_name)->get($class_name);

    if (!$reflection->isSubClassOf('ActiveRecord\\Model'))
        throw new RelationshipException("'$class_name' must extend from ActiveRecord\\Model");

    $this->class_name = $class_name;
}

--

"has_many through" doesn't work with namespace, we must also update ActiveRecord\HasMany::load() :

public function load(Model $model)
{
    $class_name = $this->class_name;
    $this->set_keys(get_class($model));

    // since through relationships depend on other relationships we can't do
    // this initiailization in the constructor since the other relationship
    // may not have been created yet and we only want this to run once
    if (!isset($this->initialized))
    {
        if ($this->through)
        {
            // verify through is a belongs_to or has_many for access of keys
            if (!($through_relationship = $this->get_table()->get_relationship($this->through)))
                throw new HasManyThroughAssociationException("Could not find the association $this->through in model " . get_class($model));

            if (!($through_relationship instanceof HasMany) && !($through_relationship instanceof BelongsTo))
                throw new HasManyThroughAssociationException('has_many through can only use a belongs_to or has_many association');

            // save old keys as we will be reseting them below for inner join convenience
            $pk = $this->primary_key;
            $fk = $this->foreign_key;

            $this->set_keys($this->get_table()->class->getName(), true);

// Start modification
            //$through_table = Table::load(classify($this->through, true));
            $through_table = Table::load($through_relationship->class_name);
// End modification
            $this->options['joins'] = $this->construct_inner_join_sql($through_table, true);

            // reset keys
            $this->primary_key = $pk;
            $this->foreign_key = $fk;
        }

        $this->initialized = true;
    }

    if (!($conditions = $this->create_conditions_from_keys($model, $this->foreign_key, $this->primary_key)))
        return null;

    $options = $this->unset_non_finder_options($this->options);
    $options['conditions'] = $conditions;
    return $class_name::find($this->poly_relationship ? 'all' : 'first',$options);
}

--

Now, this code works fine :

<?php

namespace app\models;

class User extends \ActiveRecord\Model {
    static $has_many = array(
        array('roles_users', 'class_name' => 'RoleUser'),
        array('roles', 'through' => 'roles_users'),
    );
}

class Role extends \ActiveRecord\Model {
    static $has_many = array(
        array('roles_users', 'class_name' => 'RoleUser'),
        array('users', 'through' => 'roles_users'),
    );
}

class RoleUser extends \ActiveRecord\Model {
    static $table_name = 'roles_users';
    static $belongs_to = array(
        array('role'),
        array('user'),
    );
}

$user  = \app\models\User::first();
$roles = $user->roles;

This tweaks are made for resolving "has_many" issues. Sames issue may appears with "belongs_to", but i don't look at this yet.

(sorry for my bad English, this message was translated from french)