Adds support for Views.

diesel/src/expression/operators.rs

@@ -557,12 +557,14 @@ use crate::insertable::{ColumnInsertValue, Insertable};
 use crate::query_builder::{QueryFragment, QueryId, ValuesClause};
 use crate::query_source::Column;
 use crate::sql_types::{DieselNumericOps, SqlType};
+use crate::Table;
 
-impl<T, U> Insertable<T::Table> for Eq<T, U>
+impl<T, U> Insertable<T::Source> for Eq<T, U>
 where
     T: Column,
+    T::Source: Table,
 {
-    type Values = ValuesClause<ColumnInsertValue<T, U>, T::Table>;
+    type Values = ValuesClause<ColumnInsertValue<T, U>, T::Source>;
 
     fn values(self) -> Self::Values {
         ValuesClause::new(ColumnInsertValue::new(self.right))

diesel/src/insertable.rs

@@ -154,11 +154,12 @@ impl<T> Default for DefaultableColumnInsertValue<T> {
     }
 }
 
-impl<Col, Expr, DB> InsertValues<DB, Col::Table>
+impl<Col, Expr, DB> InsertValues<DB, Col::Source>
     for DefaultableColumnInsertValue<ColumnInsertValue<Col, Expr>>
 where
     DB: Backend + SqlDialect<InsertWithDefaultKeyword = sql_dialect::default_keyword_for_insert::IsoSqlDefaultKeyword>,
     Col: Column,
+    Col::Source: Table,
     Expr: Expression<SqlType = Col::SqlType> + AppearsOnTable<NoFromClause>,
     Self: QueryFragment<DB>,
 {
@@ -168,10 +169,11 @@ where
     }
 }
 
-impl<Col, Expr, DB> InsertValues<DB, Col::Table> for ColumnInsertValue<Col, Expr>
+impl<Col, Expr, DB> InsertValues<DB, Col::Source> for ColumnInsertValue<Col, Expr>
 where
     DB: Backend,
     Col: Column,
+    Col::Source: Table,
     Expr: Expression<SqlType = Col::SqlType> + AppearsOnTable<NoFromClause>,
     Self: QueryFragment<DB>,
 {
@@ -218,10 +220,11 @@ where
 }
 
 #[cfg(feature = "sqlite")]
-impl<Col, Expr> InsertValues<crate::sqlite::Sqlite, Col::Table>
+impl<Col, Expr> InsertValues<crate::sqlite::Sqlite, Col::Source>
     for DefaultableColumnInsertValue<ColumnInsertValue<Col, Expr>>
 where
     Col: Column,
+    Col::Source: Table,
     Expr: Expression<SqlType = Col::SqlType> + AppearsOnTable<NoFromClause>,
     Self: QueryFragment<crate::sqlite::Sqlite>,
 {

diesel/src/lib.rs

@@ -725,6 +725,8 @@ pub mod prelude {
     };
     #[doc(inline)]
     pub use diesel_derives::table_proc as table;
+    #[doc(inline)]
+    pub use diesel_derives::view_proc as view;
 
     #[cfg(feature = "mysql")]
     #[doc(inline)]
@@ -742,6 +744,8 @@ pub mod prelude {
 
 #[doc(inline)]
 pub use crate::macros::table;
+#[doc(inline)]
+pub use crate::macros::view;
 pub use crate::prelude::*;
 #[doc(inline)]
 pub use crate::query_builder::debug_query;

diesel/src/macros/mod.rs

@@ -14,6 +14,8 @@ pub(crate) mod prelude {
 
 #[doc(inline)]
 pub use diesel_derives::table_proc as table;
+#[doc(inline)]
+pub use diesel_derives::view_proc as view;
 
 /// Allow two tables to be referenced in a join query without providing an
 /// explicit `ON` clause.
@@ -211,8 +213,8 @@ macro_rules! joinable_inner {
 macro_rules! allow_tables_to_appear_in_same_query {
     ($left_mod:ident, $($right_mod:ident),+ $(,)*) => {
         $(
-            impl $crate::query_source::TableNotEqual<$left_mod::table> for $right_mod::table {}
-            impl $crate::query_source::TableNotEqual<$right_mod::table> for $left_mod::table {}
+            impl $crate::query_source::ViewNotEqual<$left_mod::table> for $right_mod::table {}
+            impl $crate::query_source::ViewNotEqual<$right_mod::table> for $left_mod::table {}
             $crate::__diesel_internal_backend_specific_allow_tables_to_appear_in_same_query!($left_mod, $right_mod);
         )+
         $crate::allow_tables_to_appear_in_same_query!($($right_mod,)+);
@@ -227,44 +229,44 @@ macro_rules! allow_tables_to_appear_in_same_query {
 #[cfg(feature = "postgres_backend")]
 macro_rules! __diesel_internal_backend_specific_allow_tables_to_appear_in_same_query {
     ($left:ident, $right:ident) => {
-        impl $crate::query_source::TableNotEqual<$left::table>
+        impl $crate::query_source::ViewNotEqual<$left::table>
             for $crate::query_builder::Only<$right::table>
         {
         }
-        impl $crate::query_source::TableNotEqual<$right::table>
+        impl $crate::query_source::ViewNotEqual<$right::table>
             for $crate::query_builder::Only<$left::table>
         {
         }
-        impl $crate::query_source::TableNotEqual<$crate::query_builder::Only<$left::table>>
+        impl $crate::query_source::ViewNotEqual<$crate::query_builder::Only<$left::table>>
             for $right::table
         {
         }
-        impl $crate::query_source::TableNotEqual<$crate::query_builder::Only<$right::table>>
+        impl $crate::query_source::ViewNotEqual<$crate::query_builder::Only<$right::table>>
             for $left::table
         {
         }
-        impl<TSM> $crate::query_source::TableNotEqual<$left::table>
+        impl<TSM> $crate::query_source::ViewNotEqual<$left::table>
             for $crate::query_builder::Tablesample<$right::table, TSM>
         where
             TSM: $crate::internal::table_macro::TablesampleMethod,
         {
         }
-        impl<TSM> $crate::query_source::TableNotEqual<$right::table>
+        impl<TSM> $crate::query_source::ViewNotEqual<$right::table>
             for $crate::query_builder::Tablesample<$left::table, TSM>
         where
             TSM: $crate::internal::table_macro::TablesampleMethod,
         {
         }
         impl<TSM>
-            $crate::query_source::TableNotEqual<
+            $crate::query_source::ViewNotEqual<
                 $crate::query_builder::Tablesample<$left::table, TSM>,
             > for $right::table
         where
             TSM: $crate::internal::table_macro::TablesampleMethod,
         {
         }
         impl<TSM>
-            $crate::query_source::TableNotEqual<
+            $crate::query_source::ViewNotEqual<
                 $crate::query_builder::Tablesample<$right::table, TSM>,
             > for $left::table
         where

diesel/src/pg/expression/operators.rs

@@ -7,7 +7,7 @@ use crate::query_builder::{AstPass, QueryFragment, QueryId};
 use crate::sql_types::{
     Array, Bigint, Bool, DieselNumericOps, Inet, Integer, Jsonb, SqlType, Text,
 };
-use crate::{Column, QueryResult};
+use crate::{Column, QueryResult, Table};
 
 __diesel_infix_operator!(IsDistinctFrom, " IS DISTINCT FROM ", ConstantNullability Bool, backend: Pg);
 __diesel_infix_operator!(IsNotDistinctFrom, " IS NOT DISTINCT FROM ", ConstantNullability Bool, backend: Pg);
@@ -94,8 +94,9 @@ where
 impl<L, R> AssignmentTarget for ArrayIndex<L, R>
 where
     L: Column,
+    L::Source: Table,
 {
-    type Table = <L as Column>::Table;
+    type Table = <L as Column>::Source;
     type QueryAstNode = ArrayIndex<UncorrelatedColumn<L>, R>;
 
     fn into_target(self) -> Self::QueryAstNode {

diesel/src/pg/query_builder/copy/copy_from.rs

@@ -198,7 +198,7 @@ macro_rules! impl_copy_from_insertable_helper_for_values_clause {
             T>
                 where
                 T: Table,
-                $($ST: Column<Table = T>,)*
+                $($ST: Column<Source = T>,)*
                 ($($ST,)*): CopyTarget,
                 $($TT: ToSql<$T, Pg>,)*
             {
@@ -229,7 +229,7 @@ macro_rules! impl_copy_from_insertable_helper_for_values_clause {
             T>
                 where
                 T: Table,
-                $($ST: Column<Table = T>,)*
+                $($ST: Column<Source = T>,)*
                 ($($ST,)*): CopyTarget,
                 $($TT: ToSql<$T, Pg>,)*
             {

diesel/src/pg/query_builder/copy/mod.rs

@@ -148,7 +148,7 @@ macro_rules! copy_target_for_columns {
         $(
             impl<T, $($ST,)*> CopyTarget for ($($ST,)*)
             where
-                $($ST: Column<Table = T>,)*
+                $($ST: Column<Source = T>,)*
                 ($(<$ST as Expression>::SqlType,)*): SqlType,
                 T: Table + StaticQueryFragment,
                 T::Component: QueryFragment<Pg>,

diesel/src/pg/query_builder/only.rs

@@ -1,7 +1,7 @@
 use crate::expression::{Expression, ValidGrouping};
 use crate::pg::Pg;
 use crate::query_builder::{AsQuery, AstPass, FromClause, QueryFragment, QueryId, SelectStatement};
-use crate::query_source::QuerySource;
+use crate::query_source::{QuerySource, View};
 use crate::result::QueryResult;
 use crate::{JoinTo, SelectableExpression, Table};
 
@@ -74,22 +74,32 @@ where
         <S as JoinTo<T>>::join_target(rhs)
     }
 }
+
+impl<S> View for Only<S>
+where
+    S: Table + Clone + AsQuery,
+
+    <S as Table>::PrimaryKey: SelectableExpression<Only<S>>,
+    <S as View>::AllColumns: SelectableExpression<Only<S>>,
+    <S as QuerySource>::DefaultSelection: ValidGrouping<()> + SelectableExpression<Only<S>>,
+{
+    type AllColumns = <S as View>::AllColumns;
+    fn all_columns() -> Self::AllColumns {
+        S::all_columns()
+    }
+}
+
 impl<S> Table for Only<S>
 where
     S: Table + Clone + AsQuery,
 
     <S as Table>::PrimaryKey: SelectableExpression<Only<S>>,
-    <S as Table>::AllColumns: SelectableExpression<Only<S>>,
+    <S as View>::AllColumns: SelectableExpression<Only<S>>,
     <S as QuerySource>::DefaultSelection: ValidGrouping<()> + SelectableExpression<Only<S>>,
 {
     type PrimaryKey = <S as Table>::PrimaryKey;
-    type AllColumns = <S as Table>::AllColumns;
 
     fn primary_key(&self) -> Self::PrimaryKey {
         self.source.primary_key()
     }
-
-    fn all_columns() -> Self::AllColumns {
-        S::all_columns()
-    }
 }

diesel/src/pg/query_builder/tablesample.rs

@@ -1,7 +1,7 @@
 use crate::expression::{Expression, ValidGrouping};
 use crate::pg::Pg;
 use crate::query_builder::{AsQuery, AstPass, FromClause, QueryFragment, QueryId, SelectStatement};
-use crate::query_source::QuerySource;
+use crate::query_source::{QuerySource, View};
 use crate::result::QueryResult;
 use crate::sql_types::{Double, SmallInt};
 use crate::{JoinTo, SelectableExpression, Table};
@@ -147,26 +147,38 @@ where
     }
 }
 
+impl<S, TSM> View for Tablesample<S, TSM>
+where
+    S: Table + Clone + AsQuery,
+    TSM: TablesampleMethod,
+
+    <S as Table>::PrimaryKey: SelectableExpression<Tablesample<S, TSM>>,
+    <S as View>::AllColumns: SelectableExpression<Tablesample<S, TSM>>,
+    <S as QuerySource>::DefaultSelection:
+        ValidGrouping<()> + SelectableExpression<Tablesample<S, TSM>>,
+{
+    type AllColumns = <S as View>::AllColumns;
+
+    fn all_columns() -> Self::AllColumns {
+        S::all_columns()
+    }
+}
+
 impl<S, TSM> Table for Tablesample<S, TSM>
 where
     S: Table + Clone + AsQuery,
     TSM: TablesampleMethod,
 
     <S as Table>::PrimaryKey: SelectableExpression<Tablesample<S, TSM>>,
-    <S as Table>::AllColumns: SelectableExpression<Tablesample<S, TSM>>,
+    <S as View>::AllColumns: SelectableExpression<Tablesample<S, TSM>>,
     <S as QuerySource>::DefaultSelection:
         ValidGrouping<()> + SelectableExpression<Tablesample<S, TSM>>,
 {
     type PrimaryKey = <S as Table>::PrimaryKey;
-    type AllColumns = <S as Table>::AllColumns;
 
     fn primary_key(&self) -> Self::PrimaryKey {
         self.source.primary_key()
     }
-
-    fn all_columns() -> Self::AllColumns {
-        S::all_columns()
-    }
 }
 
 #[cfg(test)]

diesel/src/query_builder/insert_statement/column_list.rs

@@ -1,5 +1,5 @@
-use crate::query_builder::*;
 use crate::query_source::Column;
+use crate::{query_builder::*, Table};
 
 /// Represents the column list for use in an insert statement.
 ///
@@ -17,8 +17,9 @@ pub trait ColumnList {
 impl<C> ColumnList for C
 where
     C: Column,
+    C::Source: Table,
 {
-    type Table = <C as Column>::Table;
+    type Table = <C as Column>::Source;
 
     fn walk_ast<DB: Backend>(&self, mut out: AstPass<'_, '_, DB>) -> QueryResult<()> {
         out.push_identifier(C::NAME)?;

diesel/src/query_builder/insert_statement/mod.rs

@@ -322,12 +322,18 @@ impl<'a, T, Tab> UndecoratedInsertRecord<Tab> for &'a T where
 {
 }
 
-impl<T, U> UndecoratedInsertRecord<T::Table> for ColumnInsertValue<T, U> where T: Column {}
+impl<T, U> UndecoratedInsertRecord<T::Source> for ColumnInsertValue<T, U>
+where
+    T: Column,
+    T::Source: Table,
+{
+}
 
-impl<T, U> UndecoratedInsertRecord<T::Table>
+impl<T, U> UndecoratedInsertRecord<T::Source>
     for DefaultableColumnInsertValue<ColumnInsertValue<T, U>>
 where
     T: Column,
+    T::Source: Table,
 {
 }
 
@@ -342,14 +348,24 @@ where
 
 impl<T, Table> UndecoratedInsertRecord<Table> for Vec<T> where [T]: UndecoratedInsertRecord<Table> {}
 
-impl<Lhs, Rhs> UndecoratedInsertRecord<Lhs::Table> for Eq<Lhs, Rhs> where Lhs: Column {}
+impl<Lhs, Rhs> UndecoratedInsertRecord<Lhs::Source> for Eq<Lhs, Rhs>
+where
+    Lhs: Column,
+    Lhs::Source: Table,
+{
+}
 
 impl<Lhs, Rhs, Tab> UndecoratedInsertRecord<Tab> for Option<Eq<Lhs, Rhs>> where
     Eq<Lhs, Rhs>: UndecoratedInsertRecord<Tab>
 {
 }
 
-impl<Lhs, Rhs> UndecoratedInsertRecord<Lhs::Table> for Grouped<Eq<Lhs, Rhs>> where Lhs: Column {}
+impl<Lhs, Rhs> UndecoratedInsertRecord<Lhs::Source> for Grouped<Eq<Lhs, Rhs>>
+where
+    Lhs: Column,
+    Lhs::Source: Table,
+{
+}
 
 impl<Lhs, Rhs, Tab> UndecoratedInsertRecord<Tab> for Option<Grouped<Eq<Lhs, Rhs>>> where
     Eq<Lhs, Rhs>: UndecoratedInsertRecord<Tab>

diesel/src/query_builder/update_statement/changeset.rs

@@ -120,8 +120,9 @@ where
 impl<C> AssignmentTarget for C
 where
     C: Column,
+    C::Source: Table,
 {
-    type Table = C::Table;
+    type Table = C::Source;
     type QueryAstNode = ColumnWrapperForUpdate<C>;
 
     fn into_target(self) -> Self::QueryAstNode {

diesel/src/query_builder/upsert/on_conflict_actions.rs

@@ -120,9 +120,10 @@ where
     type SqlType = T::SqlType;
 }
 
-impl<T> AppearsOnTable<T::Table> for Excluded<T>
+impl<T> AppearsOnTable<T::Source> for Excluded<T>
 where
     T: Column,
+    T::Source: Table,
     Excluded<T>: Expression,
 {
 }