Some bugfixes #14

marcominerva · Oct 25, 2023 · 5a1bd26 · 5a1bd26
1 parent 34fe6ab
commit 5a1bd26
Show file tree

Hide file tree

Showing 18 changed files with 92 additions and 139 deletions.
diff --git a/samples/DatabaseGptConsole/Application.cs b/samples/DatabaseGptConsole/Application.cs
@@ -3,7 +3,6 @@
 using DatabaseGpt.Extensions;
 using DatabaseGpt.Models;
 using DatabaseGpt.Settings;
-using Microsoft.Extensions.Options;
 using Spectre.Console;
 
 namespace DatabaseGptConsole;
@@ -13,10 +12,10 @@ internal class Application
     private readonly IDatabaseGptClient databaseGptClient;
     private readonly DatabaseGptSettings databaseSettings;
 
-    public Application(IDatabaseGptClient databaseGptClient, IOptions<DatabaseGptSettings> databaseSettingsOptions)
+    public Application(IDatabaseGptClient databaseGptClient, DatabaseGptSettings databaseSettings)
     {
         this.databaseGptClient = databaseGptClient;
-        databaseSettings = databaseSettingsOptions.Value;
+        this.databaseSettings = databaseSettings;
     }
 
     public async Task ExecuteAsync()
@@ -46,7 +45,7 @@ public async Task ExecuteAsync()
                 AnsiConsole.WriteLine();
                 AnsiConsole.WriteLine();
 
-                AnsiConsole.WriteLine($"I think the following tables might be useful: {string.Join(", ", args.Tables)}.");
+                AnsiConsole.Write($"I think the following tables might be useful: {string.Join(", ", args.Tables)}.");
 
                 return default;
             },
@@ -57,6 +56,7 @@ public async Task ExecuteAsync()
 
                 AnsiConsole.WriteLine("The query to answer the question should be the following:");
 
+                AnsiConsole.WriteLine();
                 AnsiConsole.WriteLine(args.Sql);
                 AnsiConsole.WriteLine();
 

diff --git a/samples/DatabaseGptConsole/DatabaseGptConsole.csproj b/samples/DatabaseGptConsole/DatabaseGptConsole.csproj
@@ -5,7 +5,6 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <UserSecretsId>cace36d6-2904-4a1a-ae73-7f5071a723ed</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/samples/DatabaseGptConsole/Program.cs b/samples/DatabaseGptConsole/Program.cs
@@ -28,16 +28,19 @@
 static void ConfigureServices(HostBuilderContext context, IServiceCollection services)
 {
     services.AddSingleton<Application>();
+
     services.AddDatabaseGpt(database =>
-        {
-            // For using SQL Server
-            database.UseConfiguration(context.Configuration)
-                    .UseSqlServer(context.Configuration["ConnectionStrings:SqlConnection"]);
+    {
+        // For SQL Server.
+        database.UseConfiguration(context.Configuration)
+                .UseSqlServer(context.Configuration["ConnectionStrings:SqlConnection"]);
 
-            // For using Postgres
-            // database.UseConfiguration(context.Configuration)
-            //         .UseNpgsql(context.Configuration["ConnectionStrings:SqlConnection"]);
-        },
-        chatgpt => chatgpt.UseConfiguration(context.Configuration)
-    );
+        // For Postgre SQL.
+        //database.UseConfiguration(context.Configuration)
+        //        .UseNpgsql(context.Configuration["ConnectionStrings:NpgsqlConnection"]);
+    },
+    chatGpt =>
+    {
+        chatGpt.UseConfiguration(context.Configuration);
+    });
 }
diff --git a/samples/DatabaseGptConsole/appsettings.json b/samples/DatabaseGptConsole/appsettings.json
@@ -12,7 +12,7 @@
         "MessageLimit": 20,
         "MessageExpiration": "00:30:00"
     },
-    "DatabaseSettings": {
+    "DatabaseGptSettings": {
         "IncludedTables": [ ],
         "ExcludedTables": [ ],
         "ExcludedColumns": [ ],

diff --git a/src/DatabaseGpt.Abstractions/Exceptions/DatabaseGptException.cs b/src/DatabaseGpt.Abstractions/Exceptions/DatabaseGptException.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DatabaseGpt.Abstractions.Exceptions;
+namespace DatabaseGpt.Abstractions.Exceptions;
 
 public class DatabaseGptException : Exception
 {
@@ -20,8 +13,4 @@ public DatabaseGptException(string? message) : base(message)
     public DatabaseGptException(string? message, Exception? innerException) : base(message, innerException)
     {
     }
-
-    protected DatabaseGptException(SerializationInfo info, StreamingContext context) : base(info, context)
-    {
-    }
 }
diff --git a/src/DatabaseGpt.Abstractions/IDatabaseGptProvider.cs b/src/DatabaseGpt.Abstractions/IDatabaseGptProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Data;
 
 namespace DatabaseGpt.Abstractions;
 

diff --git a/src/DatabaseGpt.Npgsql/NpgsqlDatabaseGptExtensions.cs b/src/DatabaseGpt.Npgsql/NpgsqlDatabaseGptExtensions.cs
@@ -1,13 +1,15 @@
 using DatabaseGpt.Abstractions;
 using DatabaseGpt.Npgsql;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace DatabaseGpt;
 
 public static class NpgsqlDatabaseGptExtensions
 {
-    public static void UseNpgsql(this IDatabaseGptSettings databaseGptSettings, string connectionString)
+    public static void UseNpgsql(this IDatabaseGptSettings databaseGptSettings, string? connectionString)
     {
-        databaseGptSettings.SetDatabaseGptProviderFactory(() => new NpgsqlDatabaseGptProvider(new() { ConnectionString = connectionString }));
+        databaseGptSettings.SetDatabaseGptProviderFactory(() => new NpgsqlDatabaseGptProvider(new()
+        {
+            ConnectionString = connectionString
+        }));
     }
 }
diff --git a/src/DatabaseGpt.Npgsql/NpgsqlDatabaseGptProvider.cs b/src/DatabaseGpt.Npgsql/NpgsqlDatabaseGptProvider.cs
@@ -12,14 +12,13 @@ public class NpgsqlDatabaseGptProvider : IDatabaseGptProvider, IDisposable
     private readonly NpgsqlConnection connection;
     private bool disposedValue;
 
-    public string Name => "Postgres";
+    public string Name => "PostgreSQL";
 
-    public string Language => "Postgres SQL";
+    public string Language => "PL/pgSQL";
 
     public NpgsqlDatabaseGptProvider(NpgsqlDatabaseGptProviderConfiguration settings)
     {
         connection = new NpgsqlConnection(settings.ConnectionString);
-        connection.Open();
     }
 
     public async Task<IEnumerable<string>> GetTablesAsync(IEnumerable<string> includedTables, IEnumerable<string> excludedTables)
@@ -32,27 +31,16 @@ WHERE TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')
 
         if (includedTables?.Any() ?? false)
         {
-            tables = tables.Where(t => includedTables.Contains(t));
+            tables = tables.Where(t => includedTables.Contains(t, StringComparer.InvariantCultureIgnoreCase));
         }
         else if (excludedTables?.Any() ?? false)
         {
-            tables = tables.Where(t => !excludedTables.Contains(t));
+            tables = tables.Where(t => !excludedTables.Contains(t, StringComparer.InvariantCultureIgnoreCase));
         }
 
         return tables;
     }
 
-    public async Task<IDataReader> ExecuteQueryAsync(string query)
-    {
-        try
-        {
-            return await connection.ExecuteReaderAsync(query);
-        }
-        catch (NpgsqlException ex)
-        {
-            throw new DatabaseGptException("An error occurred while executing the query. See the inner exception for details", ex);
-        }
-    }
     public async Task<string> GetCreateTablesScriptAsync(IEnumerable<string> tables, IEnumerable<string> excludedColumns)
     {
         var result = new StringBuilder();
@@ -82,6 +70,18 @@ FROM INFORMATION_SCHEMA.COLUMNS
         return result.ToString();
     }
 
+    public async Task<IDataReader> ExecuteQueryAsync(string query)
+    {
+        try
+        {
+            return await connection.ExecuteReaderAsync(query);
+        }
+        catch (NpgsqlException ex)
+        {
+            throw new DatabaseGptException("An error occurred while executing the query. See the inner exception for details", ex);
+        }
+    }
+
     protected virtual void Dispose(bool disposing)
     {
         if (!disposedValue)

diff --git a/src/DatabaseGpt.SqlServer/SqlServerDatabaseGptExtensions.cs b/src/DatabaseGpt.SqlServer/SqlServerDatabaseGptExtensions.cs
@@ -1,13 +1,15 @@
 using DatabaseGpt.Abstractions;
 using DatabaseGpt.SqlServer;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace DatabaseGpt;
 
 public static class SqlServerDatabaseGptExtensions
 {
-    public static void UseSqlServer(this IDatabaseGptSettings databaseGptSettings, string connectionString)
+    public static void UseSqlServer(this IDatabaseGptSettings databaseGptSettings, string? connectionString)
     {
-        databaseGptSettings.SetDatabaseGptProviderFactory(() => new SqlServerDatabaseGptProvider(new() { ConnectionString = connectionString }));
+        databaseGptSettings.SetDatabaseGptProviderFactory(() => new SqlServerDatabaseGptProvider(new()
+        {
+            ConnectionString = connectionString
+        }));
     }
 }
diff --git a/src/DatabaseGpt.SqlServer/SqlServerDatabaseGptProvider.cs b/src/DatabaseGpt.SqlServer/SqlServerDatabaseGptProvider.cs
@@ -3,7 +3,6 @@
 using Dapper;
 using DatabaseGpt.Abstractions;
 using DatabaseGpt.Abstractions.Exceptions;
-using DatabaseGpt.SqlServer.TypeHandlers;
 using Microsoft.Data.SqlClient;
 
 namespace DatabaseGpt.SqlServer;
@@ -17,16 +16,9 @@ public class SqlServerDatabaseGptProvider : IDatabaseGptProvider, IDisposable
 
     public string Language => "T-SQL";
 
-    static SqlServerDatabaseGptProvider()
-    {
-        SqlMapper.AddTypeHandler(new DateOnlyTypeHandler());
-        SqlMapper.AddTypeHandler(new TimeOnlyTypeHandler());
-    }
-
     public SqlServerDatabaseGptProvider(SqlServerDatabaseGptProviderConfiguration settings)
     {
         connection = new SqlConnection(settings.ConnectionString);
-        connection.Open();
     }
 
     public async Task<IEnumerable<string>> GetTablesAsync(IEnumerable<string> includedTables, IEnumerable<string> excludedTables)
@@ -35,27 +27,16 @@ public async Task<IEnumerable<string>> GetTablesAsync(IEnumerable<string> includ
 
         if (includedTables?.Any() ?? false)
         {
-            tables = tables.Where(t => includedTables.Contains(t));
+            tables = tables.Where(t => includedTables.Contains(t, StringComparer.InvariantCultureIgnoreCase));
         }
         else if (excludedTables?.Any() ?? false)
         {
-            tables = tables.Where(t => !excludedTables.Contains(t));
+            tables = tables.Where(t => !excludedTables.Contains(t, StringComparer.InvariantCultureIgnoreCase));
         }
 
         return tables;
     }
 
-    public async Task<IDataReader> ExecuteQueryAsync(string query)
-    {
-        try
-        {
-            return await connection.ExecuteReaderAsync(query);
-        }
-        catch (SqlException ex)
-        {
-            throw new DatabaseGptException("An error occurred while executing the query. See the inner exception for details", ex);
-        }
-    }
     public async Task<string> GetCreateTablesScriptAsync(IEnumerable<string> tables, IEnumerable<string> excludedColumns)
     {
         var result = new StringBuilder();
@@ -82,13 +63,25 @@ FOR XML PATH('')), 1, 1, ''
                 );
                 """;
 
-            var columns = await connection.QueryAsync<string>(query, new { schema = table.Schema, table = table.Name, ExcludedColumns = excludedColumns });
+            var columns = await connection.QueryFirstAsync<string>(query, new { schema = table.Schema, table = table.Name, ExcludedColumns = excludedColumns });
             result.AppendLine($"CREATE TABLE [{table.Schema}].[{table.Name}] ({columns});");
         }
 
         return result.ToString();
     }
 
+    public async Task<IDataReader> ExecuteQueryAsync(string query)
+    {
+        try
+        {
+            return await connection.ExecuteReaderAsync(query);
+        }
+        catch (SqlException ex)
+        {
+            throw new DatabaseGptException("An error occurred while executing the query. See the inner exception for details", ex);
+        }
+    }
+
     protected virtual void Dispose(bool disposing)
     {
         if (!disposedValue)

diff --git a/src/DatabaseGpt.SqlServer/TypeHandlers/DateOnlyTypeHandler.cs b/src/DatabaseGpt.SqlServer/TypeHandlers/DateOnlyTypeHandler.cs
diff --git a/src/DatabaseGpt.SqlServer/TypeHandlers/TimeOnlyTypeHandler.cs b/src/DatabaseGpt.SqlServer/TypeHandlers/TimeOnlyTypeHandler.cs
diff --git a/src/DatabaseGpt/DatabaseGpt.csproj b/src/DatabaseGpt/DatabaseGpt.csproj
@@ -8,7 +8,6 @@
 
     <ItemGroup>
         <PackageReference Include="ChatGptNet" Version="2.6.3" />
-        <PackageReference Include="ConsoleTables" Version="2.5.0" />
         <PackageReference Include="Polly.Extensions" Version="8.0.0" />
     </ItemGroup>