Query builder v2

.github/workflows/deploy-prerelease.yml

@@ -2,7 +2,7 @@ name: NuGet Deploy (Prerelease)
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev, feat/querybuilder-v2 ]
 
 env: 
   BuildNumber: "${{ github.run_number }}"
@@ -20,8 +20,12 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
       - name: Build
-        run: dotnet build src/EdgeDB.Net.Driver/EdgeDB.Net.Driver.csproj --configuration Release --no-restore
+        run: |
+          dotnet build src/EdgeDB.Net.Driver/EdgeDB.Net.Driver.csproj --configuration Release --no-restore
+          dotnet build src/EdgeDB.Net.QueryBuilder/EdgeDB.Net.QueryBuilder.csproj --configuration Release --no-restore
       - name: Pack
-        run: dotnet pack src/EdgeDB.Net.Driver/EdgeDB.Net.Driver.csproj -c Release -o ./artifacts --no-build
+        run: | 
+          dotnet pack src/EdgeDB.Net.Driver/EdgeDB.Net.Driver.csproj -c Release -o ./artifacts --no-build
+          dotnet pack src/EdgeDB.Net.QueryBuilder/EdgeDB.Net.QueryBuilder.csproj -c Release -o ./artifacts --no-build
       - name: Upload
         run: dotnet nuget push ./artifacts/EdgeDB.Net.*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source https://www.myget.org/F/edgedb-net/api/v2/package

EdgeDB.Net.sln

@@ -31,7 +31,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDB.Examples.ExampleTODO
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EdgeDB.Examples.FSharp", "examples\EdgeDB.Examples.FSharp\EdgeDB.Examples.FSharp.fsproj", "{F25AA805-163F-46B4-942E-B1A5EBE8383C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdgeDB.DocGenerator", "tools\EdgeDB.DocGenerator\EdgeDB.DocGenerator.csproj", "{776EAE34-5A30-45B0-9277-C399CC2ABA53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDB.DocGenerator", "tools\EdgeDB.DocGenerator\EdgeDB.DocGenerator.csproj", "{776EAE34-5A30-45B0-9277-C399CC2ABA53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDB.Net.QueryBuilder", "src\EdgeDB.Net.QueryBuilder\EdgeDB.Net.QueryBuilder.csproj", "{0E7F8D0A-621C-4F82-84B6-136DA819E10C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDB.QueryBuilder.StandardLibGenerator", "tools\EdgeDB.QueryBuilder.StandardLibGenerator\EdgeDB.QueryBuilder.StandardLibGenerator.csproj", "{A13D17CE-1715-44AE-9E89-66DFE37583B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdgeDB.Net.Queryable", "src\EdgeDB.Net.Queryable\EdgeDB.Net.Queryable.csproj", "{1821FFB3-460F-4987-B32C-F8CDA000AD25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -83,6 +89,18 @@ Global
 		{776EAE34-5A30-45B0-9277-C399CC2ABA53}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{776EAE34-5A30-45B0-9277-C399CC2ABA53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{776EAE34-5A30-45B0-9277-C399CC2ABA53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E7F8D0A-621C-4F82-84B6-136DA819E10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E7F8D0A-621C-4F82-84B6-136DA819E10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E7F8D0A-621C-4F82-84B6-136DA819E10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E7F8D0A-621C-4F82-84B6-136DA819E10C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A13D17CE-1715-44AE-9E89-66DFE37583B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A13D17CE-1715-44AE-9E89-66DFE37583B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A13D17CE-1715-44AE-9E89-66DFE37583B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A13D17CE-1715-44AE-9E89-66DFE37583B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1821FFB3-460F-4987-B32C-F8CDA000AD25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1821FFB3-460F-4987-B32C-F8CDA000AD25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1821FFB3-460F-4987-B32C-F8CDA000AD25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1821FFB3-460F-4987-B32C-F8CDA000AD25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -99,6 +117,9 @@ Global
 		{E38429C6-53A5-4311-8189-1F78238666DC} = {6FC214F5-C912-4D99-91B1-3E9F52A4E11B}
 		{F25AA805-163F-46B4-942E-B1A5EBE8383C} = {6FC214F5-C912-4D99-91B1-3E9F52A4E11B}
 		{776EAE34-5A30-45B0-9277-C399CC2ABA53} = {67ED9EF0-7828-44C0-8CB0-DEBD69EC94CA}
+		{0E7F8D0A-621C-4F82-84B6-136DA819E10C} = {025AAADF-16AF-4367-9C3D-9E60EDED832F}
+		{A13D17CE-1715-44AE-9E89-66DFE37583B1} = {67ED9EF0-7828-44C0-8CB0-DEBD69EC94CA}
+		{1821FFB3-460F-4987-B32C-F8CDA000AD25} = {025AAADF-16AF-4367-9C3D-9E60EDED832F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4E90C94F-D693-4411-82F3-2051DE1BE052}

dbschema/default.esdl

@@ -15,6 +15,8 @@ module default {
     required property email -> str {
       constraint exclusive;
     }
+    link best_friend -> Person;
+    multi link friends -> Person;
   }
 
   # for example todo app

dbschema/migrations/00001.edgeql

@@ -1,8 +1,82 @@
-CREATE MIGRATION m1gajj2cjvikxjfhwnczhcfrcdlycg5pbg7vvehuaohazd2ltajlnq
+CREATE MIGRATION m1cpt5buyevyky24nrcoyjzfl67idj3uculwgo47zpxjnkb442knjq
     ONTO initial
 {
+  CREATE MODULE tests IF NOT EXISTS;
+  CREATE GLOBAL default::abc -> tuple<std::str, std::int64>;
+  CREATE GLOBAL default::current_user_id -> std::uuid;
+  CREATE ABSTRACT TYPE default::AbstractThing {
+      CREATE REQUIRED PROPERTY name: std::str {
+          CREATE CONSTRAINT std::exclusive;
+      };
+  };
+  CREATE TYPE default::OtherThing EXTENDING default::AbstractThing {
+      CREATE REQUIRED PROPERTY attribute: std::str;
+  };
+  CREATE TYPE default::Thing EXTENDING default::AbstractThing {
+      CREATE REQUIRED PROPERTY description: std::str;
+  };
   CREATE TYPE default::Person {
-      CREATE PROPERTY email -> std::str;
-      CREATE PROPERTY name -> std::str;
+      CREATE LINK best_friend: default::Person;
+      CREATE MULTI LINK friends: default::Person;
+      CREATE REQUIRED PROPERTY email: std::str {
+          CREATE CONSTRAINT std::exclusive;
+      };
+      CREATE REQUIRED PROPERTY name: std::str;
+  };
+  CREATE TYPE default::Movie {
+      CREATE REQUIRED MULTI LINK actors: default::Person;
+      CREATE REQUIRED LINK director: default::Person;
+      CREATE REQUIRED PROPERTY title: std::str {
+          CREATE CONSTRAINT std::exclusive;
+      };
+      CREATE REQUIRED PROPERTY year: std::int32;
+  };
+  CREATE SCALAR TYPE default::State EXTENDING enum<NotStarted, InProgress, Complete>;
+  CREATE TYPE default::TODO {
+      CREATE REQUIRED PROPERTY date_created: std::datetime {
+          SET default := (std::datetime_current());
+      };
+      CREATE REQUIRED PROPERTY description: std::str;
+      CREATE REQUIRED PROPERTY state: default::State;
+      CREATE REQUIRED PROPERTY title: std::str;
+  };
+  CREATE TYPE default::UserWithSnowflakeId {
+      CREATE REQUIRED PROPERTY user_id: std::str {
+          CREATE CONSTRAINT std::exclusive;
+      };
+      CREATE REQUIRED PROPERTY username: std::str;
+  };
+  CREATE TYPE tests::Person {
+      CREATE LINK best_friend: tests::Person;
+      CREATE MULTI LINK friends: tests::Person;
+      CREATE PROPERTY age: std::int32;
+      CREATE PROPERTY email: std::str;
+      CREATE PROPERTY name: std::str;
+  };
+  CREATE TYPE tests::Club {
+      CREATE MULTI LINK admins: tests::Person;
+      CREATE MULTI LINK members: tests::Person;
+      CREATE PROPERTY name: std::str;
+  };
+  CREATE TYPE tests::ScalarContainer {
+      CREATE PROPERTY a: std::int16;
+      CREATE PROPERTY b: std::int32;
+      CREATE PROPERTY c: std::int64;
+      CREATE PROPERTY d: std::str;
+      CREATE PROPERTY e: std::bool;
+      CREATE PROPERTY f: std::float32;
+      CREATE PROPERTY g: std::float64;
+      CREATE PROPERTY h: std::bigint;
+      CREATE PROPERTY i: std::decimal;
+      CREATE PROPERTY j: std::uuid;
+      CREATE PROPERTY k: std::json;
+      CREATE PROPERTY l: std::datetime;
+      CREATE PROPERTY m: cal::local_datetime;
+      CREATE PROPERTY n: cal::local_date;
+      CREATE PROPERTY o: cal::local_time;
+      CREATE PROPERTY p: std::duration;
+      CREATE PROPERTY q: cal::relative_duration;
+      CREATE PROPERTY r: cal::date_duration;
+      CREATE PROPERTY s: std::bytes;
   };
 };

dbschema/tests.esdl

@@ -20,4 +20,18 @@ module tests {
     r: cal::date_duration;
     s: bytes;
   }
+
+  type Person {
+    name: str;
+    age: int32;
+    email: str;
+    best_friend: Person;
+    multi friends: Person;
+  }
+
+  type Club {
+    name: str;
+    multi members: Person;
+    multi admins: Person;
+  }
 }