<<<<<<< HEAD:bin/transform_readinglist.pl my $user_data = $gscript->{db}->sqlSelectHashRef('merge_files.merge_id, merge_files.uid as uid, merge_files.id as file_id, item_limit, type, sort, filter, account_levels.account_level, account_levels.max_merge_feeds as maxfeeds, account_levels.max_feed_age as maxage, users.history as history, account_levels.max_history as max_history, hosted_files.title as title', 'hosted_files LEFT JOIN users USING (uid) LEFT JOIN merge_files USING (uid) LEFT JOIN account_levels USING (account_level)', { 'merge_files.merge_id' => $opt_merge_id}); my $user_data = $gscript->{db}->sqlSelectHashRef('merge_files.merge_id, merge_files.uid as uid, merge_files.id as file_id, item_limit, type, sort, filter, account_levels.account_level, account_levels.max_merge_feeds as maxfeeds, account_levels.max_feed_age as maxage, users.history as history, account_levels.max_history as max_history, hosted_files.title as title', 'hosted_files,users,merge_files,account_levels', { 'merge_files.merge_id' => $opt_merge_id, '-merge_files.merge_id' => 'hosted_files.merge_id', '-hosted_files.uid' => 'users.uid', '-users.account_level' => 'account_levels.account_level'}); ======= my $user_data = $gscript->{db}->sqlSelectHashRef('merge_files.merge_id, merge_files.uid as uid, merge_files.id as file_id, item_limit, type, sort, filter, account_levels.account_level, account_levels.max_merge_feeds as maxfeeds, account_levels.max_merge_age as maxage, users.history as history, account_levels.max_history as max_history, hosted_files.title as title', 'hosted_files LEFT JOIN users USING (uid) LEFT JOIN merge_files USING (uid) LEFT JOIN account_levels USING (account_level)', { 'merge_id' => $opt_merge_id}); >>>>>>> c41cc4150778704968a811b304b668da7cb05027:bin/transform_readinglist.pl