Merge branch 'develop' of https://github.com/marcominerva/DatabaseGPT into develop

Author: marcominerva

src/DatabaseGpt.SqlServer/SqlServerDatabaseGptProvider.cs

@@ -57,55 +57,23 @@ public async Task<string> GetCreateTablesScriptAsync(IEnumerable<string> tables,
         foreach (var table in splittedTableNames)
         {
             var query = $"""
-                SELECT TABLE_SCHEMA AS [SCHEMA], TABLE_NAME AS [TABLE], COLUMN_NAME AS [COLUMN],
-                    UPPER(DATA_TYPE) + ISNULL('(' + IIF(CHARACTER_MAXIMUM_LENGTH = -1, 'MAX', CAST(CHARACTER_MAXIMUM_LENGTH AS VARCHAR(10))) + ')','') + ' ' + 
-                    CASE WHEN IS_NULLABLE = 'YES' THEN 'NULL' ELSE 'NOT NULL' END AS DESCRIPTION
-                FROM
-                    INFORMATION_SCHEMA.COLUMNS
-                WHERE
-                    TABLE_SCHEMA = @schema AND TABLE_NAME = @table
+                SELECT '[' + COLUMN_NAME + '] ' + 
+                    UPPER(DATA_TYPE) + COALESCE('(' + 
+                    CASE WHEN CHARACTER_MAXIMUM_LENGTH = -1 THEN 'MAX' ELSE CAST(CHARACTER_MAXIMUM_LENGTH AS VARCHAR(10)) END + ')','') + ' ' + 
+                    CASE WHEN IS_NULLABLE = 'YES' THEN 'NULL' ELSE 'NOT NULL' END
+                FROM INFORMATION_SCHEMA.COLUMNS
+                WHERE TABLE_SCHEMA = @schema
+                    AND TABLE_NAME = @table
+                    AND COLUMN_NAME NOT IN @{nameof(excludedColumns)}
+                    AND TABLE_SCHEMA + '.' + TABLE_NAME + '.' + COLUMN_NAME NOT IN @{nameof(excludedColumns)};
                 """;
 
-            var allColumns = await connection.QueryAsync<ColumnEntity>(query, new { schema = table.Schema, table = table.Name });
-
-            var columns = allColumns.Where(c => IsIncluded(c, excludedColumns))
-                .Select(c => $"[{c.Column}] {c.Description}").ToList();
+            var columns = await connection.QueryAsync<ColumnEntity>(query, new { schema = table.Schema, table = table.Name, excludedColumns });
 
             result.AppendLine($"CREATE TABLE [{table.Schema}].[{table.Name}] ({string.Join(',', columns)});");
         }
 
         return result.ToString();
-
-        static bool IsIncluded(ColumnEntity column, IEnumerable<string> excludedColumns)
-        {
-            // Checks if the column should be included or not, verifying if it is present in the list of excluded columns.
-            var isIncluded = excludedColumns.All(e =>
-            {
-                var parts = e.Split('.');
-                var schemaOrColumnName = parts.ElementAtOrDefault(0)?.Trim();
-                var tableName = parts.ElementAtOrDefault(1)?.Trim();
-                var columnName = parts.ElementAtOrDefault(2)?.Trim();
-
-                if (string.IsNullOrWhiteSpace(columnName))
-                {
-                    // The columnName variable is null: it means that the excluded column has been specified without the full qualified name.
-                    // In this case, the schemaOrColumnName variable contains the column name and it is a column that must be excluded from all tables.
-                    var isExcluded = column.Column.Equals(schemaOrColumnName, StringComparison.OrdinalIgnoreCase);
-                    return !isExcluded;
-                }
-                else
-                {
-                    // The excluded column has been specified using the full qualified name.
-                    var isExcluded = column.Schema.Equals(schemaOrColumnName, StringComparison.OrdinalIgnoreCase)
-                       && column.Table.Equals(tableName, StringComparison.OrdinalIgnoreCase)
-                       && column.Column.Equals(columnName, StringComparison.OrdinalIgnoreCase);
-
-                    return !isExcluded;
-                }
-            });
-
-            return isIncluded;
-        }
     }
 
     public Task<string?> GetQueryHintsAsync(CancellationToken cancellationToken = default)