IgnitedRecord 1.0 pre-release

[eluser]MarcoITA[/eluser]
Another small issue.

When trying to create 2 relations to the same table the SQL query does not use aliases for the tables, creating SQL error.

Example with two 'belongs_to' relations to the same 'users' table via different fks: default ('user_id') & 'ultimoagg_user_id'

Model:

Code:

class Content extends IgnitedRecord {

    var $habtm = array(
        'pages' => array(
            'name'          => 'pages',
            'join_table'    => 'blocks',
            'attr'          => array('zona','posizione'),
        )

    );

    var $belongs_to = array(
        'user',

        'ultimoagg_user' => array(
            'table' => 'users',
            'name'  => 'ultimoagg_user',
            'fk'    => 'ultimoagg_user_id',
        ),
    );

SQL generated:

Code:

SELECT
  portal_blocks.zona,
  portal_blocks.posizione,
  portal_users.id AS user_id,
  portal_users.login AS user_login,
  portal_users.password AS user_password,
  portal_users.nome AS user_nome,
  portal_users.email AS user_email,
  portal_users.id AS ultimoagg_user_id,
  portal_users.login AS ultimoagg_user_login,
  portal_users.password AS ultimoagg_user_password,
  portal_users.nome AS ultimoagg_user_nome,
  portal_users.email AS ultimoagg_user_email,
  portal_contents.*

FROM
(`portal_contents`)
JOIN
`portal_blocks`
  ON portal_blocks.content_id = portal_contents.id
LEFT JOIN
  `portal_users`
  ON portal_contents.user_id = portal_users.id
LEFT JOIN
  `portal_users`
  ON portal_contents.ultimoagg_user_id = portal_users.id
WHERE
  portal_blocks.page_id = '1'
ORDER BY
  zona, posizione

this give SQL Error Number 1066: Not unique table/alias: 'portal_users'

SQL should use relations' defined name as aliases for related tables' joins:

Code:

SELECT
  portal_blocks.zona,
  portal_blocks.posizione,
  user.id AS user_id,
  user.login AS user_login,
  user.password AS user_password,
  user.nome AS user_nome,
  user.email AS user_email,
  ultimoagg_user.id AS ultimoagg_user_id,
  ultimoagg_user.login AS ultimoagg_user_login,
  ultimoagg_user.password AS ultimoagg_user_password,
  ultimoagg_user.nome AS ultimoagg_user_nome,
  ultimoagg_user.email AS ultimoagg_user_email,
  portal_contents.*

FROM
(`portal_contents`)
JOIN
`portal_blocks`  
  ON portal_blocks.content_id = portal_contents.id
LEFT JOIN
  `portal_users` as user
  ON portal_contents.user_id = user.id
LEFT JOIN
  `portal_users` as ultimoagg_user
  ON portal_contents.ultimoagg_user_id = ultimoagg_user.id
WHERE
  portal_blocks.page_id = '1'
ORDER BY
  zona, posizione