Merge pull request diesel-rs#2916 from gorbit99/master

Added generated column support for sqlite when the type is specified

diesel_cli/src/infer_schema_internals/data_structures.rs

@@ -97,9 +97,9 @@ where
 #[cfg(feature = "sqlite")]
 impl<ST> Queryable<ST, Sqlite> for ColumnInformation
 where
-    (i32, String, String, bool, Option<String>, bool): FromStaticSqlRow<ST, Sqlite>,
+    (i32, String, String, bool, Option<String>, bool, i32): FromStaticSqlRow<ST, Sqlite>,
 {
-    type Row = (i32, String, String, bool, Option<String>, bool);
+    type Row = (i32, String, String, bool, Option<String>, bool, i32);
 
     fn build(row: Self::Row) -> deserialize::Result<Self> {
         Ok(ColumnInformation::new(row.1, row.2, None, !row.3))

diesel_cli/src/infer_schema_internals/sqlite.rs

@@ -21,6 +21,7 @@ table! {
         notnull -> Bool,
         dflt_value -> Nullable<VarChar>,
         pk -> Bool,
+        hidden -> Integer,
     }
 }
 
@@ -89,12 +90,50 @@ pub fn load_foreign_key_constraints(
     Ok(rows.into_iter().flatten().collect())
 }
 
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+struct SqliteVersion {
+    major: u32,
+    minor: u32,
+    patch: u32,
+}
+
+impl SqliteVersion {
+    pub fn new(major: u32, minor: u32, patch: u32) -> SqliteVersion {
+        SqliteVersion {
+            major,
+            minor,
+            patch,
+        }
+    }
+}
+
+fn get_sqlite_version(conn: &mut SqliteConnection) -> SqliteVersion {
+    let query = "SELECT sqlite_version()";
+    let result = sql::<sql_types::Text>(&query).load::<String>(conn).unwrap();
+    let parts = result[0]
+        .split('.')
+        .map(|part| part.parse().unwrap())
+        .collect::<Vec<u32>>();
+    assert_eq!(parts.len(), 3);
+    SqliteVersion::new(parts[0], parts[1], parts[2])
+}
+
 pub fn get_table_data(
     conn: &mut SqliteConnection,
     table: &TableName,
     column_sorting: &ColumnSorting,
 ) -> QueryResult<Vec<ColumnInformation>> {
-    let query = format!("PRAGMA TABLE_INFO('{}')", &table.sql_name);
+    let sqlite_version = get_sqlite_version(conn);
+    let query = if sqlite_version >= SqliteVersion::new(3, 26, 0) {
+        /*
+         * To get generated columns we need to use TABLE_XINFO
+         * This would return hidden columns as well, but those would need to be created at runtime
+         * therefore they aren't an issue.
+         */
+        format!("PRAGMA TABLE_XINFO('{}')", &table.sql_name)
+    } else {
+        format!("PRAGMA TABLE_INFO('{}')", &table.sql_name)
+    };
     let mut result = sql::<pragma_table_info::SqlType>(&query).load(conn)?;
     match column_sorting {
         ColumnSorting::OrdinalPosition => {}
@@ -115,6 +154,7 @@ struct FullTableInfo {
     _not_null: bool,
     _dflt_value: Option<String>,
     primary_key: bool,
+    _hidden: i32,
 }
 
 #[derive(Queryable)]
@@ -133,7 +173,12 @@ pub fn get_primary_keys(
     conn: &mut SqliteConnection,
     table: &TableName,
 ) -> QueryResult<Vec<String>> {
-    let query = format!("PRAGMA TABLE_INFO('{}')", &table.sql_name);
+    let sqlite_version = get_sqlite_version(conn);
+    let query = if sqlite_version >= SqliteVersion::new(3, 26, 0) {
+        format!("PRAGMA TABLE_XINFO('{}')", &table.sql_name)
+    } else {
+        format!("PRAGMA TABLE_INFO('{}')", &table.sql_name)
+    };
     let results = sql::<pragma_table_info::SqlType>(&query).load::<FullTableInfo>(conn)?;
     Ok(results
         .into_iter()
@@ -144,7 +189,11 @@ pub fn get_primary_keys(
 pub fn determine_column_type(
     attr: &ColumnInformation,
 ) -> Result<ColumnType, Box<dyn Error + Send + Sync + 'static>> {
-    let type_name = attr.type_name.to_lowercase();
+    let mut type_name = attr.type_name.to_lowercase();
+    if type_name == "generated always" {
+        type_name.clear();
+    }
+
     let path = if is_bool(&type_name) {
         String::from("Bool")
     } else if is_smallint(&type_name) {

diesel_cli/tests/print_schema.rs

@@ -198,6 +198,18 @@ fn print_schema_specifying_schema_name_with_custom_type() {
     )
 }
 
+#[test]
+#[cfg(feature = "sqlite")]
+fn print_schema_generated_columns() {
+    test_print_schema("print_schema_generated_columns", vec![])
+}
+
+#[test]
+#[cfg(feature = "sqlite")]
+fn print_schema_generated_columns_with_generated_always() {
+    test_print_schema("print_schema_generated_columns_generated_always", vec![])
+}
+
 #[cfg(feature = "sqlite")]
 const BACKEND: &str = "sqlite";
 #[cfg(feature = "postgres")]

diesel_cli/tests/print_schema/print_schema_generated_columns/diesel.toml

@@ -0,0 +1,3 @@
+[print_schema]
+file = "src/schema.rs"
+with_docs = false

diesel_cli/tests/print_schema/print_schema_generated_columns/sqlite/expected.rs

@@ -0,0 +1,8 @@
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
+    generated (id) {
+        id -> Nullable<Integer>,
+        generated -> Nullable<Integer>,
+    }
+}

diesel_cli/tests/print_schema/print_schema_generated_columns/sqlite/schema.sql

@@ -0,0 +1,4 @@
+CREATE TABLE generated (
+    id integer primary key,
+    generated integer as (id * 3)
+);

diesel_cli/tests/print_schema/print_schema_generated_columns_generated_always/diesel.toml

@@ -0,0 +1,3 @@
+[print_schema]
+file = "src/schema.rs"
+with_docs = false

diesel_cli/tests/print_schema/print_schema_generated_columns_generated_always/sqlite/expected.rs

@@ -0,0 +1,8 @@
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
+    generated (id) {
+        id -> Nullable<Integer>,
+        generated -> Nullable<Integer>,
+    }
+}

diesel_cli/tests/print_schema/print_schema_generated_columns_generated_always/sqlite/schema.sql

@@ -0,0 +1,4 @@
+CREATE TABLE generated (
+    id integer primary key,
+    generated integer generated always as (id * 3)
+);