Fixe jsonb on string

Author: amigin

my-postgres-core/src/sync_table_schema/sync_table_fields.rs

@@ -5,10 +5,7 @@ use my_logger::LogEventCtx;
 use my_telemetry::MyTelemetryContext;
 use rust_extensions::StrOrString;
 
-use crate::{
-    table_schema::{SchemaDifference, TableColumn, TableColumnType, TableSchema, DEFAULT_SCHEMA},
-    ColumnName, MyPostgresError, PostgresConnection, RequestContext,
-};
+use crate::{table_schema::*, ColumnName, MyPostgresError, PostgresConnection, RequestContext};
 
 pub async fn sync_table_fields(
     conn_string: &PostgresConnection,

my-postgres-core/src/table_schema/sql_type_provider.rs

@@ -95,13 +95,19 @@ impl SqlTypeProvider for f64 {
 }
 
 impl SqlTypeProvider for String {
-    fn get_sql_type(_metadata: Option<SqlValueMetadata>) -> TableColumnType {
+    fn get_sql_type(metadata: Option<SqlValueMetadata>) -> TableColumnType {
+        if let Some(result) = TableColumnType::from_sql_metadata(&metadata) {
+            return result;
+        }
         TableColumnType::Text
     }
 }
 
 impl SqlTypeProvider for Option<String> {
-    fn get_sql_type(_metadata: Option<SqlValueMetadata>) -> TableColumnType {
+    fn get_sql_type(metadata: Option<SqlValueMetadata>) -> TableColumnType {
+        if let Some(result) = TableColumnType::from_sql_metadata(&metadata) {
+            return result;
+        }
         TableColumnType::Text
     }
 }

my-postgres-core/src/table_schema/table_column_type.rs

@@ -1,3 +1,5 @@
+use crate::SqlValueMetadata;
+
 #[derive(Debug, Clone)]
 pub enum TableColumnType {
     Text,
@@ -13,6 +15,31 @@ pub enum TableColumnType {
 }
 
 impl TableColumnType {
+    pub fn from_sql_metadata(sql_metadata: &Option<SqlValueMetadata>) -> Option<Self> {
+        let sql_metadata = sql_metadata.as_ref()?;
+        let sql_type = sql_metadata.sql_type.as_ref()?;
+
+        if sql_type.starts_with("timestamp") {
+            return Some(TableColumnType::Timestamp);
+        }
+
+        if sql_type.starts_with("double") {
+            return Some(TableColumnType::Double);
+        }
+
+        match *sql_type {
+            "text" => Some(TableColumnType::Text),
+            "smallint" => Some(TableColumnType::SmallInt),
+            "bigint" => Some(TableColumnType::BigInt),
+            "boolean" => Some(TableColumnType::Boolean),
+            "real" => Some(TableColumnType::Real),
+            "integer" => Some(TableColumnType::Integer),
+            "json" => Some(TableColumnType::Json),
+            "jsonb" => Some(TableColumnType::Jsonb),
+            _ => None,
+        }
+    }
+
     pub fn as_number(&self) -> i32 {
         match self {
             TableColumnType::Text => 0,