Skip to content

Commit 9936d83

Browse files
ahmad-moussawiahmad-moussawi
committed
remove Program folder
1 parent 0b12f6a commit 9936d83

File tree

10 files changed

+83
-227
lines changed

10 files changed

+83
-227
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,36 @@ on:
22
push:
33
branches:
44
- main
5+
env:
6+
# Stop wasting time caching packages
7+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
8+
# Disable sending usage data to Microsoft
9+
DOTNET_CLI_TELEMETRY_OPTOUT: true
10+
11+
# MYSQL DB
12+
DB_MYSQL_DATABASE: test_sqlkata
13+
DB_MYSQL_USER: root
14+
DB_MYSQL_PASSWORD: "root"
15+
DB_MYSQL_HOST: localhost
516
jobs:
617
build:
718
runs-on: ubuntu-latest
819
timeout-minutes: 15
920
steps:
1021
- name: Checkout
11-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
1223
- name: Build
1324
run: dotnet build --configuration Release
25+
- name: Start MySql
26+
run: |
27+
sudo /etc/init.d/mysql start
28+
mysqladmin -u ${{ env.DB_MYSQL_USER }} -p${{ env.DB_MYSQL_PASSWORD }} password ''
29+
mysql -e 'CREATE DATABASE ${{ env.DB_MYSQL_DATABASE }};' -u${{ env.DB_MYSQL_USER }}
30+
mysql -e 'CREATE TABLE cars(id int primary key auto_increment);' -u${{ env.DB_MYSQL_USER }} ${{ env.DB_MYSQL_DATABASE }}
31+
mysql -e 'SHOW TABLES;' -u${{ env.DB_MYSQL_USER }} ${{ env.DB_MYSQL_DATABASE }}
1432
- name: Test
1533
run: dotnet test --configuration Release --no-build
34+
env:
35+
SQLKATA_MYSQL_HOST: ${{ env.DB_MYSQL_HOST }}
36+
SQLKATA_MYSQL_USER: ${{ env.DB_MYSQL_USER }}
37+
SQLKATA_MYSQL_DB: ${{ env.DB_MYSQL_DATABASE }}

‎Program/Program.cs‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎Program/Program.csproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎QueryBuilder.Tests/MySqlExecutionTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void ExistsShouldReturnFalseForEmptyTable()
174174
});
175175

176176
var exists = db.Query("Transaction").Exists();
177-
Assert.Equal(false, exists);
177+
Assert.False(exists);
178178

179179
db.Drop("Transaction");
180180
}
@@ -195,7 +195,7 @@ public void ExistsShouldReturnTrueForNonEmptyTable()
195195
});
196196

197197
var exists = db.Query("Transaction").Exists();
198-
Assert.Equal(true, exists);
198+
Assert.True(exists);
199199

200200
db.Drop("Transaction");
201201
}

‎QueryBuilder.Tests/QueryBuilder.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<OutputType>Library</OutputType>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>SqlKata.Tests</RootNamespace>

‎QueryBuilder/Compilers/Compiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ protected virtual SqlResult CompileSelectQuery(Query query)
229229

230230
protected virtual SqlResult CompileAdHocQuery(AdHocTableFromClause adHoc)
231231
{
232-
var ctx = new SqlResult();
232+
var ctx = new SqlResult(parameterPlaceholder, EscapeCharacter);
233233

234234
var row = "SELECT " + string.Join(", ", adHoc.Columns.Select(col => $"{parameterPlaceholder} AS {Wrap(col)}"));
235235

‎QueryBuilder/Compilers/SqlServerCompiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected override string CompileBasicDateCondition(SqlResult ctx, BasicDateCond
173173

174174
protected override SqlResult CompileAdHocQuery(AdHocTableFromClause adHoc)
175175
{
176-
var ctx = new SqlResult();
176+
var ctx = new SqlResult(parameterPlaceholder, EscapeCharacter);
177177

178178
var colNames = string.Join(", ", adHoc.Columns.Select(Wrap));
179179

‎QueryBuilder/QueryBuilder.csproj‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<Title>SqlKata The C# Sql Query Builder</Title>
5-
<Description>A powerful Dynamic Sql Query Builder supporting Sql Server, MySql, PostgreSql, Oracle and Firebird</Description>
6-
<Authors>Ahmad Moussawi</Authors>
7-
<Copyright>Copyright (c) 2017 Ahmad Moussawi</Copyright>
8-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
9-
<RootNamespace>SqlKata</RootNamespace>
10-
<AssemblyName>SqlKata</AssemblyName>
11-
12-
<!-- NuGet settings -->
13-
<PackageId>SqlKata</PackageId>
14-
<PackageTags>sql;query-builder;dynamic-query</PackageTags>
15-
<PackageReleaseNotes>https://github.com/sqlkata/querybuilder</PackageReleaseNotes>
16-
<PackageProjectUrl>https://github.com/sqlkata/querybuilder</PackageProjectUrl>
17-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
18-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
19-
<RepositoryType>git</RepositoryType>
20-
<RepositoryUrl>https://github.com/sqlkata/querybuilder</RepositoryUrl>
21-
22-
<!-- SourceLink settings -->
23-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
24-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
25-
<NoWarn>CS1591</NoWarn>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
28-
<DocumentationFile>bin\Debug\netstandard2.0\SqlKata.xml</DocumentationFile>
29-
</PropertyGroup>
30-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
31-
<DocumentationFile>bin\Release\netstandard2.0\SqlKata.xml</DocumentationFile>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
35-
</ItemGroup>
36-
</Project>
3+
<PropertyGroup>
4+
<Title>SqlKata</Title>
5+
<Description>A powerful Dynamic Sql Query Builder supporting SQL Server, MySql, PostgreSql, Sqlite, and Oracle</Description>
6+
<Authors>Ahmad Moussawi</Authors>
7+
<Copyright>Copyright (c) 2017 Ahmad Moussawi</Copyright>
8+
<TargetFramework>net8.0</TargetFramework>
9+
<RootNamespace>SqlKata</RootNamespace>
10+
<AssemblyName>SqlKata.Core</AssemblyName>
11+
<!-- NuGet settings -->
12+
<PackageId>SqlKata</PackageId>
13+
<PackageTags>sql;query-builder;dynamic-query</PackageTags>
14+
<PackageReleaseNotes>https://github.com/sqlkata/querybuilder</PackageReleaseNotes>
15+
<PackageProjectUrl>https://github.com/sqlkata/querybuilder</PackageProjectUrl>
16+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
17+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
18+
<RepositoryType>git</RepositoryType>
19+
<RepositoryUrl>https://github.com/sqlkata/querybuilder</RepositoryUrl>
20+
<!-- SourceLink settings -->
21+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
23+
<NoWarn>CS1591</NoWarn>
24+
</PropertyGroup>
25+
</Project>

‎SqlKata.Execution/SqlKata.Execution.csproj‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<Title>SqlKata The C# Sql Query Builder</Title>
4-
<Description>Adds the execution capabilities for SqlKata</Description>
5-
<Authors>Ahmad Moussawi</Authors>
6-
<Copyright>Copyright (c) 2017 Ahmad Moussawi</Copyright>
7-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
8-
<RootNamespace>SqlKata</RootNamespace>
9-
10-
<!-- NuGet settings -->
11-
<PackageId>SqlKata.Execution</PackageId>
12-
<PackageTags>sql;query-builder;dynamic-query</PackageTags>
13-
<PackageReleaseNotes>https://github.com/sqlkata/querybuilder</PackageReleaseNotes>
14-
<PackageProjectUrl>https://github.com/sqlkata/querybuilder</PackageProjectUrl>
15-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
16-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
17-
<RepositoryType>git</RepositoryType>
18-
<RepositoryUrl>https://github.com/sqlkata/querybuilder</RepositoryUrl>
19-
20-
<!-- SourceLink settings -->
21-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
23-
<NoWarn>CS1591</NoWarn>
24-
</PropertyGroup>
25-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
26-
<DocumentationFile>bin\Release\netstandard2.0\SqlKata.Execution.xml</DocumentationFile>
27-
</PropertyGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
29-
<DocumentationFile>bin\Debug\netstandard2.0\SqlKata.Execution.xml</DocumentationFile>
30-
</PropertyGroup>
31-
<ItemGroup>
32-
<ProjectReference Include="..\QueryBuilder\QueryBuilder.csproj" />
33-
</ItemGroup>
34-
<ItemGroup>
35-
<PackageReference Include="dapper" Version="2.0.123" />
36-
<PackageReference Include="Humanizer.Core" Version="2.8.26" />
37-
</ItemGroup>
38-
</Project>
2+
<PropertyGroup>
3+
<Title>SqlKata</Title>
4+
<Description>Adds the execution capabilities for SqlKata</Description>
5+
<Authors>Ahmad Moussawi</Authors>
6+
<Copyright>Copyright (c) 2017 Ahmad Moussawi</Copyright>
7+
<TargetFramework>net8.0</TargetFramework>
8+
<RootNamespace>SqlKata</RootNamespace>
9+
<!-- NuGet settings -->
10+
<PackageId>SqlKata.Execution</PackageId>
11+
<PackageTags>sql;query-builder;dynamic-query</PackageTags>
12+
<PackageReleaseNotes>https://github.com/sqlkata/querybuilder</PackageReleaseNotes>
13+
<PackageProjectUrl>https://github.com/sqlkata/querybuilder</PackageProjectUrl>
14+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
15+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16+
<RepositoryType>git</RepositoryType>
17+
<RepositoryUrl>https://github.com/sqlkata/querybuilder</RepositoryUrl>
18+
<!-- SourceLink settings -->
19+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
21+
<NoWarn>CS1591</NoWarn>
22+
</PropertyGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\QueryBuilder\QueryBuilder.csproj" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<PackageReference Include="dapper"
28+
Version="2.0.123" />
29+
<PackageReference Include="Humanizer.Core"
30+
Version="2.8.26" />
31+
</ItemGroup>
32+
</Project>

‎sqlkata.sln‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryBuilder.Tests", "Query
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlKata.Execution", "SqlKata.Execution\SqlKata.Execution.csproj", "{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Program", "Program\Program.csproj", "{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}"
13-
EndProject
1412
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86D00525-7428-4DD7-914D-0A10D5C53EDE}"
1513
ProjectSection(SolutionItems) = preProject
1614
.editorconfig = .editorconfig
@@ -62,18 +60,6 @@ Global
6260
{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x64.Build.0 = Release|Any CPU
6361
{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.ActiveCfg = Release|Any CPU
6462
{B6DF0569-6040-4EAF-A38B-E4DEB8DC76E0}.Release|x86.Build.0 = Release|Any CPU
65-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
67-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.ActiveCfg = Debug|Any CPU
68-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x64.Build.0 = Debug|Any CPU
69-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.ActiveCfg = Debug|Any CPU
70-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Debug|x86.Build.0 = Debug|Any CPU
71-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.ActiveCfg = Release|Any CPU
74-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x64.Build.0 = Release|Any CPU
75-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.ActiveCfg = Release|Any CPU
76-
{5DEA7DBC-5B8A-44A9-A070-55E95881A4CF}.Release|x86.Build.0 = Release|Any CPU
7763
EndGlobalSection
7864
GlobalSection(SolutionProperties) = preSolution
7965
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)