Merge branch 'MySQL_Dev'

Author: sgoley

.vs/ODBCDirect/v15/.suo

@@ -7,7 +7,7 @@ section ODBCMySQLDirect;
 // no-op and simply returns the original value.
 EnableTraceOutput = true;
 
-Config_DriverName = "PostgreSQL Unicode(x64)";
+Config_DriverName = "MySQL ODBC 8.0 Unicode (x64)";
 Config_SqlConformance = 8;  // (SQL_SC) null, 1, 2, 4, 8
 Config_GroupByCapabilities = 2; // (SQL_GB) 0, 1, 2, 3, 4
 Config_FractionalSecondsScale = 3; //set
@@ -77,37 +77,9 @@ shared ODBCMySQLDirect.Database = (dsn as text) as table =>
                 [
                 Text = Text.Format("#{0} #{1}", {offset, limit}),
                 Location = "AfterQuerySpecification"
-                ],
-            Constant =
-                    let
-                        Quote = each Text.Format("'#{0}'", { _ }),
-                        Cast = (value, typeName) => [
-                            Text = Text.Format("CAST(#{0} as #{1})", { value, typeName })
-                        ],
-                        Visitor = [
-                            // This is to work around parameters being converted to VARCHAR
-                            // and to work around driver crash when using TYPE_TIME parameters.
-                            NUMERIC = each Cast(_, "NUMERIC"),
-                            DECIMAL = each Cast(_, "DECIMAL"),
-                            INTEGER = each Cast(_, "INTEGER"),
-                            FLOAT = each Cast(_, "FLOAT"),
-                            REAL = each Cast(_, "REAL"),
-                            DOUBLE = each Cast(_, "DOUBLE"),
-                            DATE = each Cast(Quote(Date.ToText(_, "yyyy-MM-dd")), "DATE"),
-                            TEXT = each Cast(_, "WLONGVARCHAR"),
-                            TIMESTAMPTZ = each Cast(Quote(DateTime.ToText(_, "yyyy-MM-dd HH:mm:ss.sssssss")), "TIMESTAMP"),
-                            TIMETZ = each Cast(Quote(Time.ToText(_, "HH:mm:ss.sssssss")), "TIME"),
-                            UUID = each Cast(_, "GUID"),
-                            ORDER_STATUS = each Cast(_, "VARCHAR"),
-                            ORDER_TYPE = each Cast(_, "VARCHAR"),
-                            PAYMENT_BATCH_STATUS = each Cast(_, "VARCHAR"), 
-                            PAYMENT_STATUS = each Cast(_, "VARCHAR"),
-                            PAYMENT_TYPE = each Cast(_, "VARCHAR"),
-                            TRANSACTION_ACTIVITY_TYPE = each Cast(_, "VARCHAR")
-                        ]
-                    in
-                        (typeInfo, ast) => Record.FieldOrDefault(Visitor, typeInfo[TYPE_NAME], each null)(ast[Value])
+                ]
             ],
+
             // SQLGetTypeInfo can be specified in two ways:
             // 1. A #table() value that returns the same type information as an ODBC
             //    call to SQLGetTypeInfo.
@@ -120,52 +92,7 @@ shared ODBCMySQLDirect.Database = (dsn as text) as table =>
             //
             // The sample implementation provided here will simply output the original table
             // to the user trace log, without any modification. 
-            SQLGetTypeInfo = (types) => 
-                if (EnableTraceOutput <> true) then types else
-                let
-                    // Outputting the entire table might be too large, and result in the value being truncated.
-                    // We can output a row at a time instead with Table.TransformRows()
-                    rows = Table.TransformRows(types, each Diagnostics.LogValue("SQLGetTypeInfo " & _[TYPE_NAME], _)),
-                    toTable = Table.FromRecords(rows)
-                in
-                    Value.ReplaceType(toTable, Value.Type(types)),         
-
-            // This is to work around the driver returning the deprecated
-            // TIMESTAMP, DATE and TIME instead of TYPE_TIMESTAMP, TYPE_DATE and TYPE_TIME
-            // for column metadata returned by SQLColumns. The column types also don't
-            // match the types that are returned by SQLGetTypeInfo.
-            SQLColumns = (catalogName, schemaName, tableName, columnName, source) =>
-                let
-                    OdbcSqlType.DATETIME = 9,
-                    OdbcSqlType.TYPE_DATE = 91,
-                    OdbcSqlType.TIME = 10,
-                    OdbcSqlType.TYPE_TIME = 92,
-                    OdbcSqlType.TIMESTAMP = 11,
-                    OdbcSqlType.TYPE_TIMESTAMP = 93,
 
-                    FixDataType = (dataType) =>
-                        if dataType = OdbcSqlType.DATETIME then
-                            OdbcSqlType.TYPE_DATE
-                        else if dataType = OdbcSqlType.TIME then
-                            OdbcSqlType.TYPE_TIME
-                        else if dataType = OdbcSqlType.TIMESTAMP then
-                            OdbcSqlType.TYPE_TIMESTAMP
-                        else
-                            dataType,
-                    Transform = Table.TransformColumns(source, { { "DATA_TYPE", FixDataType } })
-                in
-                    if (EnableTraceOutput <> true) then Transform else
-                    // the if statement conditions will force the values to evaluated/written to diagnostics
-                    if (Diagnostics.LogValue("SQLColumns.TableName", tableName) <> "***" and Diagnostics.LogValue("SQLColumns.ColumnName", columnName) <> "***") then
-                        let
-                            // Outputting the entire table might be too large, and result in the value being truncated.
-                            // We can output a row at a time instead with Table.TransformRows()
-                            rows = Table.TransformRows(Transform, each Diagnostics.LogValue("SQLColumns", _)),
-                            toTable = Table.FromRecords(rows)
-                        in
-                            Value.ReplaceType(toTable, Value.Type(Transform))
-                    else
-                        Transform,
 
         //
         // Call to Odbc.DataSource
@@ -178,7 +105,7 @@ shared ODBCMySQLDirect.Database = (dsn as text) as table =>
             // When HierarchialNavigation is set to true, the navigation tree
             // will be organized by Database -> Schema -> Table. When set to false,
             // all tables will be displayed in a flat list using fully qualified names. 
-            HierarchicalNavigation = false,
+            HierarchicalNavigation = true,
             //Prevent exposure of Native Query
             HideNativeQuery = true,
             //Allows the M engine to select a compatible data type when conversion between two specific numeric types is not declared as supported in the SQL_CONVERT_* capabilities.
@@ -189,13 +116,7 @@ shared ODBCMySQLDirect.Database = (dsn as text) as table =>
             //Requires AstVisitor since Top is not supported in Postgres
             AstVisitor = AstVisitor,
             SqlCapabilities = SqlCapabilities,
-            SQLGetInfo = SQLGetInfo,
-            SQLColumns = SQLColumns,
-            SQLGetTypeInfo = SQLGetTypeInfo
-            /*
-            ImplicitTypeConversions = ImplicitTypeConversions,
-            OnError = OnError,
-            */
+            SQLGetInfo = SQLGetInfo
         ])
 
     in OdbcDatasource;

.vs/ODBCDirect/v16/.suo

@@ -3,5 +3,6 @@
 //Testing Not developed further because of Visual Studio / PowerBI Architecture mismatch (32 vs 64 bit.)
 //https://github.com/Microsoft/DataConnectors/issues/158
 let
+    Source = ODBCMySQLDirect.Database("Example ODBC Source")
 in
     Source