include.where and Sequelize.or()

[nichdiekuh]

Hello,

I've upgraded my install to sequelize@2.0.0-dev5 and was crossing my fingers for the new sequelize.or() feature to work. Unfortunately it doesn't in my case:

    return Parameter.findAll({where :
        Sequelize.and(
            {key :key}
        )
        ,include:[
            {
               model : Project,
                where : Sequelize.or({'id' : project_id},{'id' : null})
            }
        ]});

Results in:

{ [Error: ER_BAD_FIELD_ERROR: Unknown column 'Projects.args' in 'on clause']
  code: 'ER_BAD_FIELD_ERROR',
  errno: 1054,
  sqlState: '42S22',
  index: 0,
  sql: 'SELECT `Parameters`.*, `Projects`.`id` AS `Projects.id`, `Projects`.`name` AS `Projects.name`, `Projects`.`url` AS `Projects.url`, `Projects`.`api_key` AS `Projects.api_key`, `Projects`.`created_at` AS `Projects.created_at`, `Projects`.`customer_id` AS `Projects.customer_id`, `Projects.ParametersProject`.`project_id` AS `Projects.ParametersProject.project_id`, `Projects.ParametersProject`.`parameter_id` AS `Projects.ParametersProject.parameter_id` FROM `Parameters` INNER JOIN `ParametersProjects` AS `Projects.ParametersProject` ON `Parameters`.`id` = `Projects.ParametersProject`.`parameter_id` INNER JOIN `Projects` AS `Projects` ON `Projects`.`id` = `Projects.ParametersProject`.`project_id` AND `Projects`.`args` IN (`id` = \'1\',`id` = NULL) WHERE (`Parameters`.`key`=\'qmail\');' }

AND Projects.args IN (id = \'1\',id = NULL)

[mickhansen]

1722848

Hmm for some reason the commit is not in the 2.0dev5 tag. Can you check if it works for you on the 2.0.0 branch? If it does i'll do a new release.

[nichdiekuh]

Downloaded the 2.0 zipfile, copied the files over to my node_modules dir, and...

 AND (`Projects`.`id`='1' OR `Projects`.`id` IS NULL)

...it works! Yay! :)

[mickhansen]

Alright i'll do a release later today

[mickhansen]

I just pushed a dev6 release.

[nichdiekuh]

Thank you Mick! That was astonishingly quick!