Skip to content

Commit

Permalink
Merge pull request #3146 from weiznich/fix_name_colision_in_table_macro
Browse files Browse the repository at this point in the history 
Fix potential name collisions in code generated by the `table!` macro
  • Loading branch information
@weiznich
weiznich authored Apr 23, 2022
2 parents e4a1c10 + c1d1f2a commit b0a2c1e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
62 changes: 31 additions & 31 deletions diesel/src/macros/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ macro_rules! __diesel_internal_backend_specific_table_impls {
type FromClause = $crate::query_builder::Only<S>;
type OnClause = <$crate::query_builder::Only<S> as $crate::JoinTo<$table>>::OnClause;

fn join_target(rhs: $crate::query_builder::Only<S>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::query_builder::Only::<S>::join_target($table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::query_builder::Only<S>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::query_builder::Only::<S>::join_target($table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand Down Expand Up @@ -113,13 +113,13 @@ macro_rules! __diesel_column {
$crate::internal::table_macro::StaticQueryFragmentInstance<table>: $crate::query_builder::QueryFragment<DB>,
{
#[allow(non_snake_case)]
fn walk_ast<'b>(&'b self, mut __out: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()>
fn walk_ast<'b>(&'b self, mut __diesel_internal_out: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()>
{
const FROM_CLAUSE: $crate::internal::table_macro::StaticQueryFragmentInstance<table> = $crate::internal::table_macro::StaticQueryFragmentInstance::new();

FROM_CLAUSE.walk_ast(__out.reborrow())?;
__out.push_sql(".");
__out.push_identifier($sql_name)
FROM_CLAUSE.walk_ast(__diesel_internal_out.reborrow())?;
__diesel_internal_out.push_sql(".");
__diesel_internal_out.push_identifier($sql_name)
}
}

Expand Down Expand Up @@ -195,9 +195,9 @@ macro_rules! __diesel_column {
{
type Output = $crate::dsl::Eq<Self, T::Expression>;

fn eq_all(self, rhs: T) -> Self::Output {
fn eq_all(self, __diesel_internal_rhs: T) -> Self::Output {
use $crate::expression_methods::ExpressionMethods;
self.eq(rhs)
self.eq(__diesel_internal_rhs)
}
}

Expand Down Expand Up @@ -805,8 +805,8 @@ macro_rules! __diesel_table_impl {
DB: $crate::backend::Backend,
<table as $crate::internal::table_macro::StaticQueryFragment>::Component: $crate::query_builder::QueryFragment<DB>
{
fn walk_ast<'b>(&'b self, pass: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()> {
<table as $crate::internal::table_macro::StaticQueryFragment>::STATIC_COMPONENT.walk_ast(pass)
fn walk_ast<'b>(&'b self, __diesel_internal_pass: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()> {
<table as $crate::internal::table_macro::StaticQueryFragment>::STATIC_COMPONENT.walk_ast(__diesel_internal_pass)
}
}

Expand Down Expand Up @@ -887,8 +887,8 @@ macro_rules! __diesel_table_impl {
{
type Out = $crate::query_source::AliasedField<S, C>;

fn map(column: C, alias: &$crate::query_source::Alias<S>) -> Self::Out {
alias.field(column)
fn map(__diesel_internal_column: C, __diesel_internal_alias: &$crate::query_source::Alias<S>) -> Self::Out {
__diesel_internal_alias.field(__diesel_internal_column)
}
}

Expand All @@ -904,9 +904,9 @@ macro_rules! __diesel_table_impl {
type FromClause = $crate::internal::table_macro::Join<Left, Right, Kind>;
type OnClause = <$crate::internal::table_macro::Join<Left, Right, Kind> as $crate::JoinTo<table>>::OnClause;

fn join_target(rhs: $crate::internal::table_macro::Join<Left, Right, Kind>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::internal::table_macro::Join::join_target(table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::internal::table_macro::Join<Left, Right, Kind>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::internal::table_macro::Join::join_target(table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand All @@ -916,9 +916,9 @@ macro_rules! __diesel_table_impl {
type FromClause = $crate::internal::table_macro::JoinOn<Join, On>;
type OnClause = <$crate::internal::table_macro::JoinOn<Join, On> as $crate::JoinTo<table>>::OnClause;

fn join_target(rhs: $crate::internal::table_macro::JoinOn<Join, On>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::internal::table_macro::JoinOn::join_target(table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::internal::table_macro::JoinOn<Join, On>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::internal::table_macro::JoinOn::join_target(table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand All @@ -929,9 +929,9 @@ macro_rules! __diesel_table_impl {
type FromClause = $crate::internal::table_macro::SelectStatement<$crate::internal::table_macro::FromClause<F>, S, D, W, O, L, Of, G>;
type OnClause = <$crate::internal::table_macro::SelectStatement<$crate::internal::table_macro::FromClause<F>, S, D, W, O, L, Of, G> as $crate::JoinTo<table>>::OnClause;

fn join_target(rhs: $crate::internal::table_macro::SelectStatement<$crate::internal::table_macro::FromClause<F>, S, D, W, O, L, Of, G>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::internal::table_macro::SelectStatement::join_target(table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::internal::table_macro::SelectStatement<$crate::internal::table_macro::FromClause<F>, S, D, W, O, L, Of, G>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::internal::table_macro::SelectStatement::join_target(table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand All @@ -941,9 +941,9 @@ macro_rules! __diesel_table_impl {
{
type FromClause = $crate::internal::table_macro::BoxedSelectStatement<'a, $crate::internal::table_macro::FromClause<QS>, ST, DB>;
type OnClause = <$crate::internal::table_macro::BoxedSelectStatement<'a, $crate::internal::table_macro::FromClause<QS>, ST, DB> as $crate::JoinTo<table>>::OnClause;
fn join_target(rhs: $crate::internal::table_macro::BoxedSelectStatement<'a, $crate::internal::table_macro::FromClause<QS>, ST, DB>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::internal::table_macro::BoxedSelectStatement::join_target(table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::internal::table_macro::BoxedSelectStatement<'a, $crate::internal::table_macro::FromClause<QS>, ST, DB>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::internal::table_macro::BoxedSelectStatement::join_target(table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand All @@ -954,9 +954,9 @@ macro_rules! __diesel_table_impl {
type FromClause = $crate::query_source::Alias<S>;
type OnClause = <$crate::query_source::Alias<S> as $crate::JoinTo<table>>::OnClause;

fn join_target(rhs: $crate::query_source::Alias<S>) -> (Self::FromClause, Self::OnClause) {
let (_, on_clause) = $crate::query_source::Alias::<S>::join_target(table);
(rhs, on_clause)
fn join_target(__diesel_internal_rhs: $crate::query_source::Alias<S>) -> (Self::FromClause, Self::OnClause) {
let (_, __diesel_internal_on_clause) = $crate::query_source::Alias::<S>::join_target(table);
(__diesel_internal_rhs, __diesel_internal_on_clause)
}
}

Expand Down Expand Up @@ -1015,13 +1015,13 @@ macro_rules! __diesel_table_impl {
<table as $crate::QuerySource>::FromClause: $crate::query_builder::QueryFragment<DB>,
{
#[allow(non_snake_case)]
fn walk_ast<'b>(&'b self, mut __out: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()>
fn walk_ast<'b>(&'b self, mut __diesel_internal_out: $crate::query_builder::AstPass<'_, 'b, DB>) -> $crate::result::QueryResult<()>
{
use $crate::QuerySource;
const FROM_CLAUSE: $crate::internal::table_macro::StaticQueryFragmentInstance<table> = $crate::internal::table_macro::StaticQueryFragmentInstance::new();

FROM_CLAUSE.walk_ast(__out.reborrow())?;
__out.push_sql(".*");
FROM_CLAUSE.walk_ast(__diesel_internal_out.reborrow())?;
__diesel_internal_out.push_sql(".*");
Ok(())
}
}
Expand Down
4 changes: 2 additions & 2 deletions diesel/src/macros/ops.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ macro_rules! operator_allowed {
{
type Output = $crate::internal::table_macro::ops::$op<Self, Rhs::Expression>;

fn $fn_name(self, rhs: Rhs) -> Self::Output {
$crate::internal::table_macro::ops::$op::new(self, rhs.as_expression())
fn $fn_name(self, __diesel_internal_rhs: Rhs) -> Self::Output {
$crate::internal::table_macro::ops::$op::new(self, __diesel_internal_rhs.as_expression())
}
}
};
Expand Down

0 comments on commit b0a2c1e

Please sign in to comment.