first commit

Author: SockworkOrange

.env

@@ -1,6 +1,9 @@
 SOURCE_WASM_FILE_UBUNTU="WasmRunner/obj/release/net8.0/wasi-wasm/wasm/for-publish/WasmRunner.wasm"
 SOURCE_WASM_FILE="WasmRunner/bin/Release/net8.0/wasi-wasm/AppBundle/WasmRunner.wasm"
 TESTS_CONTAINER_NAME="plugin-tests"
-MYSQL_CONNECTION_STRING="server=mysqldb;database=tests;user=root"
-POSTGRES_CONNECTION_STRING="host=postgresdb;database=tests;username=user;password=pass"
+DB_NAME="tests"
+DB_USER="root"
+DB_PASSWORD="pass"
+MYSQL_HOST="mysqldb"
+POSTGRES_HOST="postgresdb"
 SQLC_CI_FILE="sqlc.ci.yaml"

CodeGenerator/CodeGenerator.cs

@@ -1,55 +1,26 @@
-using Grpc.Core;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Google.Protobuf;
 using Plugin;
+using RubyCodegen;
 using SqlcGenCsharp.Drivers;
-using SqlcGenCsharp.Generators;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using File = Plugin.File;
 
 namespace SqlcGenCsharp;
 
 public class CodeGenerator
 {
     private static readonly char[] Separator = ['/'];
-
-    private static readonly string[] ResharperDisables =
-    [
-        "InconsistentNaming",
-        "UnusedAutoPropertyAccessor.Global",
-        "NotAccessedPositionalProperty.Global"
-    ];
-
-    private string? _namespaceName;
     private Options? _options;
     private DbDriver? _dbDriver;
-    private DataClassesGen? _dataClassesGen;
-    private RootGen? _rootGen;
-    private UtilsGen? _utilsGen;
-    private CsprojGen? _csprojGen;
 
     private void InitGenerators(GenerateRequest generateRequest)
     {
         Options = new Options(generateRequest);
-        NamespaceName = GenerateNamespace(generateRequest);
         DbDriver = InstantiateDriver();
-
-        // initialize file generators
-        CsprojGen = new CsprojGen(generateRequest.Settings.Codegen.Out, Options);
-        RootGen = new RootGen(Options);
-        UtilsGen = new UtilsGen(NamespaceName, Options);
-        DataClassesGen = new DataClassesGen(DbDriver);
-    }
-
-    private string NamespaceName
-    {
-        get => _namespaceName!;
-        set => _namespaceName = value;
     }
 
     private Options Options
@@ -64,36 +35,12 @@ private DbDriver DbDriver
         set => _dbDriver = value;
     }
 
-    private DataClassesGen DataClassesGen
-    {
-        get => _dataClassesGen!;
-        set => _dataClassesGen = value;
-    }
-
-    private RootGen RootGen
-    {
-        get => _rootGen!;
-        set => _rootGen = value;
-    }
-
-    private UtilsGen UtilsGen
-    {
-        get => _utilsGen!;
-        set => _utilsGen = value;
-    }
-
-    private CsprojGen CsprojGen
-    {
-        get => _csprojGen!;
-        set => _csprojGen = value;
-    }
-
     private DbDriver InstantiateDriver()
     {
         return Options.DriverName switch
         {
-            DriverName.MySqlConnector => new MySqlConnectorDriver(Options.DotnetFramework),
-            DriverName.Npgsql => new NpgsqlDriver(Options.DotnetFramework),
+            DriverName.Mysql2 => new Mysql2Driver(),
+            DriverName.Pg => new PgDriver(),
             _ => throw new ArgumentException($"unknown driver: {Options.DriverName}")
         };
     }
@@ -104,8 +51,7 @@ public Task<GenerateResponse> Generate(GenerateRequest generateRequest)
         var fileQueries = GetFileQueries();
         var files = fileQueries
             .Select(fq => GenerateFile(fq.Value, fq.Key))
-            .Append(UtilsGen.GenerateFile())
-            .AppendIf(CsprojGen.GenerateFile(), Options.GenerateCsproj);
+            .Append(GenerateGemfile());
 
         return Task.FromResult(new GenerateResponse { Files = { files } });
 
@@ -138,116 +84,99 @@ private string GenerateNamespace(GenerateRequest generateRequest)
 
     private File GenerateFile(IEnumerable<Query> queries, string className)
     {
-        var (usingDirectives, classDeclaration) = GenerateClass(queries, className);
-        var root = RootGen.CompilationRootGen(
-            IdentifierName(NamespaceName), usingDirectives, classDeclaration);
-        root = AddResharperDisables(root);
-        root = root.AddCommentOnTop(Consts.AutoGeneratedComment);
+        var (requiredGems, classDeclaration) = GenerateClass(queries, className);
+        var contents = $"""
+             {Consts.AutoGeneratedComment}
+             {requiredGems.Select(r => r.Build()).JoinByNewLine()}
+             
+             {classDeclaration.Build()}
+             """;
 
         return new File
         {
-            Name = $"{className}.cs",
-            Contents = root.ToByteString()
+            Name = $"{className.SnakeCase()}.rb",
+            Contents = ByteString.CopyFromUtf8(contents)
         };
     }
 
-    private static CompilationUnitSyntax AddResharperDisables(CompilationUnitSyntax compilationUnit)
+    private File GenerateGemfile()
     {
-        return ResharperDisables
-            .Aggregate(compilationUnit, (current, resharperDisable) =>
-                current.AddCommentOnTop($"// ReSharper disable {resharperDisable}"));
-    }
+        var requireGems = DbDriver.GetRequiredGems().Select(gem => $"gem '{gem.GetName()}'").JoinByNewLine();
+        return new File
+        {
+            Name = "Gemfile",
+            Contents = ByteString.CopyFromUtf8($"""
+                                                source 'https://rubygems.org'
 
-    private (UsingDirectiveSyntax[], MemberDeclarationSyntax) GenerateClass(IEnumerable<Query> queries,
-        string className)
-    {
-        var usingDirectives = DbDriver.GetUsingDirectives();
-        var classMembers = queries.SelectMany(GetMembersForSingleQuery).ToArray();
-        return (usingDirectives, GetClassDeclaration(className, classMembers));
+                                                {requireGems}
+                                                """)
+        };
     }
 
-    private ClassDeclarationSyntax GetClassDeclaration(string className,
-        IEnumerable<MemberDeclarationSyntax> classMembers)
+    private (IEnumerable<RequireGem>, ClassDeclaration) GenerateClass(IEnumerable<Query> queries, string className)
     {
-        var classDeclaration = (ClassDeclarationSyntax)(Options.DotnetFramework.LatestDotnetSupported()
-            ? GetWithPrimaryConstructor()
-            : GetWithRegularConstructor());
-        return classDeclaration.AddMembers(classMembers.ToArray());
-
-        MemberDeclarationSyntax GetWithPrimaryConstructor()
-        {
-            return ParseMemberDeclaration(
-                    $"class {className}(string {Variable.ConnectionString.Name()})" + "{}")!
-                .AddModifiers(Token(SyntaxKind.PublicKeyword));
-        }
-
-        MemberDeclarationSyntax GetWithRegularConstructor()
-        {
-            return ParseMemberDeclaration(
-                    $$"""
-                      class {{className}}
-                      {
-                          public {{className}}(string {{Variable.ConnectionString.Name()}})
-                          {
-                              this.{{Variable.ConnectionString.Name()}} = {{Variable.ConnectionString.Name()}};
-                          }
-                          private string {{Variable.ConnectionString.Name()}} { get; }
-                      }
-                      """)!
-                .AddModifiers(Token(SyntaxKind.PublicKeyword));
-        }
+        var requiredGems = DbDriver.GetRequiredGems();
+        var initMethod = DbDriver.GetInitMethod();
+        var queryMembers = queries
+            .SelectMany(q =>
+            {
+                IEnumerable<IComposable> members = new List<IComposable>();
+                members = members.Append(GetQueryTextConstant(q));
+                members = members.AppendIfNotNull(GetQueryColumnsDataclass(q));
+                members = members.AppendIfNotNull(GetQueryParamsDataclass(q));
+                members = members.Append(GetMethodDeclaration(q));
+                return members;
+            });
+        var classMembers = new[] { initMethod }.Concat(queryMembers);
+        return (requiredGems, new ClassDeclaration(className, classMembers));
     }
 
-    private MemberDeclarationSyntax[] GetMembersForSingleQuery(Query query)
+    private static SimpleStatement GenerateDataclass(string name, ClassMember classMember, IEnumerable<Column> columns,
+        Options options)
     {
-        return new[]
-            {
-                GetQueryTextConstant(query),
-                GetQueryColumnsDataclass(query),
-                GetQueryParamsDataclass(query),
-                AddMethodDeclaration(query)
-            }
-            .Where(member => member != null)
-            .Cast<MemberDeclarationSyntax>()
-            .ToArray();
+        var dataclassName = $"{name.FirstCharToUpper()}{classMember.Name()}";
+        var dataColumns = columns.Select(c => $":{c.Name.ToLower()}").JoinByCommaAndNewLine();
+        return new SimpleStatement(dataclassName,
+            new SimpleExpression(options.RubyMajorVersion.LatestRubySupported()
+                ? $"Struct.new(\n{dataColumns.Indent()}\n)"
+                : $"Data.define(\n{dataColumns.Indent()}\n)"));
     }
 
-    private MemberDeclarationSyntax? GetQueryColumnsDataclass(Query query)
+    private SimpleStatement? GetQueryColumnsDataclass(Query query)
     {
+        if (query.Columns.Count <= 0) return null;
         return query.Columns.Count <= 0
             ? null
-            : DataClassesGen.Generate(query.Name, ClassMember.Row, query.Columns, Options);
+            : GenerateDataclass(query.Name, ClassMember.Row, query.Columns, Options);
     }
 
-    private MemberDeclarationSyntax? GetQueryParamsDataclass(Query query)
+    private SimpleStatement? GetQueryParamsDataclass(Query query)
     {
         if (query.Params.Count <= 0) return null;
         var columns = query.Params.Select(p => p.Column);
-        return DataClassesGen.Generate(query.Name, ClassMember.Args, columns, Options);
+        return GenerateDataclass(query.Name, ClassMember.Args, columns, Options);
     }
 
-    private MemberDeclarationSyntax GetQueryTextConstant(Query query)
+    private static SimpleStatement GetQueryTextConstant(Query query)
     {
-        return ParseMemberDeclaration(
-                $"private const string {query.Name}{ClassMember.Sql.Name()} = \"{DbDriver.TransformQueryText(query)}\";")
-            !
-            .AppendNewLine();
+        return new SimpleStatement($"{query.Name}{ClassMember.Sql}", new SimpleExpression($"%q({query.Text})"));
     }
 
-    private MemberDeclarationSyntax AddMethodDeclaration(Query query)
+    private MethodDeclaration GetMethodDeclaration(Query query)
     {
         var queryTextConstant = GetInterfaceName(ClassMember.Sql);
-        var argInterface = GetInterfaceName(ClassMember.Args);
+        var argInterface = GetInterfaceName(ClassMember.Args).SnakeCase();
         var returnInterface = GetInterfaceName(ClassMember.Row);
+        var funcName = query.Name.SnakeCase();
 
         return query.Cmd switch
         {
-            ":exec" => DbDriver.ExecDeclare(query.Name, queryTextConstant, argInterface, query.Params),
-            ":one" => DbDriver.OneDeclare(query.Name, queryTextConstant, argInterface, returnInterface,
+            ":one" => DbDriver.OneDeclare(funcName, queryTextConstant, argInterface, returnInterface,
                 query.Params, query.Columns),
-            ":many" => DbDriver.ManyDeclare(query.Name, queryTextConstant, argInterface, returnInterface,
+            ":many" => DbDriver.ManyDeclare(funcName, queryTextConstant, argInterface, returnInterface,
                 query.Params, query.Columns),
-            ":execlastid" => DbDriver.ExecLastIdDeclare(query.Name, queryTextConstant, argInterface, query.Params),
+            ":exec" => DbDriver.ExecDeclare(funcName, queryTextConstant, argInterface, query.Params),
+            ":execlastid" => DbDriver.ExecLastIdDeclare(funcName, queryTextConstant, argInterface, query.Params),
             _ => throw new InvalidDataException()
         };
 

CodeGenerator/CodeGenerator.csproj

@@ -8,7 +8,6 @@
 
     <ItemGroup>
         <PackageReference Include="Google.Protobuf" Version="3.26.0-rc2"/>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2"/>
     </ItemGroup>
 
     <ItemGroup>

CodeGenerator/Consts.cs

@@ -2,5 +2,5 @@ namespace SqlcGenCsharp;
 
 public static class Consts
 {
-    public const string AutoGeneratedComment = "// auto-generated by sqlc - do not edit";
+    public const string AutoGeneratedComment = "# auto-generated by sqlc - do not edit";
 }