Skip to content

Commit d18f9a7

Browse files
MaceWinduviceroypenguin
MaceWindu
and
viceroypenguin
authored
Migration to scaffold framework for code-generation (#82)
* - initial project refactoring - migration to scaffold framework * move non-code files from project folder * ifdefs refactoring * code refactoring/cleanup (in progress) * refactoring * refactor settings UI * update dependencies, fix build * convert settings control tabs to usercontrol * fix configuration dialogs styling * implement #58, fixes, Access testing done * sqlite tested * - packages support - custom types rendering - firebird fixes * sqlce (v5) fixes, v7 is not ready yet * sqlce v7 fixes * - sybase support - fixes - remove strong name * clickhouse support * sql server support (partially) * sql server support * postgresql linqpad 5 fix * npgsql types rendering * mysql/mariadb support * oracle support * sap hana support * db2/informix support * cleanup * pre-built context support * update dependencies * code cleanup * finalize release notes * Update Build/README.md Co-authored-by: Stuart Turner <[email protected]> * Update README.md Co-authored-by: Stuart Turner <[email protected]> * Update release-notes.md Co-authored-by: Stuart Turner <[email protected]> * add clickhouse provider information to UI * [clickhouse] add FixedString to string mapping option * add polysharp * sql logger: don't log RecordsAffected when it is not set * Database -> Database Type * dialect detection for sql server, oracle, pgsql --------- Co-authored-by: Stuart Turner <[email protected]>
1 parent 426207d commit d18f9a7

File tree

109 files changed

+6205
-7552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+6205
-7552
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
; What is EditorConfig? http://editorconfig.org/
2-
31
root = true
42

53
; use tabs identation for all files
@@ -227,6 +225,9 @@ dotnet_diagnostic.IDE0079.severity = none # IDE0079: Remove unnecessary suppress
227225
dotnet_diagnostic.IDE0080.severity = none # IDE0080: Remove unnecessary suppression operator
228226
dotnet_diagnostic.IDE0081.severity = none # IDE0081: Remove ByVal
229227
dotnet_diagnostic.IDE0083.severity = none # IDE0083: Use pattern matching (not operator)
228+
dotnet_diagnostic.IDE0130.severity = none # IDE0130: Namespace does not match folder structure
229+
dotnet_diagnostic.IDE0160.severity = none # IDE0160: Use block-scoped namespace
230+
dotnet_diagnostic.IDE0161.severity = error # IDE0161: Use file-scoped namespace
230231
dotnet_diagnostic.IDE1006.severity = none # IDE1006: Naming rule violation
231232

232233
dotnet_diagnostic.CS1998.severity = error # CS1998: Async method lacks 'await' operators and will run synchronously

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Ignore files build by Visual Studio
21
.vs/
32
bin/
43
obj/
4+
*.zip
55
*.lpx
66
*.lpx6
7+
*.csproj.user

‎Build/BuildNuspecs.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if ($version) {
3737
$xml.package.metadata.AppendChild($child)
3838

3939
$child = $xml.CreateElement('copyright', $nsUri)
40-
$child.InnerText = 'Copyright © 2016-2020 ' + $authors
40+
$child.InnerText = 'Copyright © 2016-2023 ' + $authors
4141
$xml.package.metadata.AppendChild($child)
4242

4343
$child = $xml.CreateElement('authors', $nsUri)

‎Source/Connection.png‎ renamed to ‎Build/Connection.png‎

File renamed without changes.

‎Source/FailedConnection.png‎ renamed to ‎Build/FailedConnection.png‎

File renamed without changes.

‎Build/Pack.bat‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
ECHO OFF
2+
ECHO Packing %2
3+
4+
DEL linq2db.LINQPad.%2
5+
DEL linq2db.LINQPad.%2.zip
6+
7+
REM LINQPad 5 driver archive generation
8+
IF %2 EQU lpx (
9+
REM remove resource satellite assemblies
10+
RD /S /Q %1\cs
11+
RD /S /Q %1\de
12+
RD /S /Q %1\es
13+
RD /S /Q %1\fr
14+
RD /S /Q %1\it
15+
RD /S /Q %1\ja
16+
RD /S /Q %1\ko
17+
RD /S /Q %1\pl
18+
RD /S /Q %1\pt
19+
RD /S /Q %1\pt-BR
20+
RD /S /Q %1\ru
21+
RD /S /Q %1\tr
22+
RD /S /Q %1\zh-Hans
23+
RD /S /Q %1\zh-Hant
24+
25+
REM remove not needed files
26+
DEL /Q %1\linq2db.*.xml
27+
DEL /Q %1\*.pdb
28+
29+
"C:\Program Files\7-Zip\7z.exe" -r a linq2db.LINQPad.%2.zip %1\*.* %1\..\..\..\..\Build\Connection.png %1\..\..\..\..\Build\FailedConnection.png %1\..\..\..\..\Build\header.xml
30+
)
31+
32+
REM LINQPad 7 driver archive generation
33+
IF %2 EQU lpx6 ("C:\Program Files\7-Zip\7z.exe" a linq2db.LINQPad.%2.zip %1\linq2db.LINQPad.dll %1\..\..\..\..\Build\Connection.png %1\..\..\..\..\Build\FailedConnection.png %1\linq2db.LINQPad.deps.json)
34+
35+
REN linq2db.LINQPad.%2.zip linq2db.LINQPad.%2
36+

‎Build/README.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
## LINQ to DB LINQPad 6 and 7 Driver
1+
# LINQ to DB LINQPad 7 Driver
22

3-
This nuget package is a driver for [LINQPad 6 and 7](http://www.linqpad.net).
3+
This nuget package is a driver for [LINQPad 7](http://www.linqpad.net). Support for LINQPad 6 is available via older 4.x drivers.
44

55
Following databases supported:
66

7-
- **DB2** (LUW, z/OS) (only 64-bit version)
7+
- **ClickHouse**: using Binary, HTTP and MySQL interfaces
8+
- **DB2** (LUW, z/OS): x64-bit version of LINQPad only
89
- **Firebird**
9-
- **Informix** (only 64-bit version)
10-
- **Microsoft Access** *(supports both OleDb and ODBC)*
11-
- **Microsoft Sql Server** 2005+ *(including **Microsoft Sql Azure**)*
12-
- **Microsoft Sql Server Compact (SqlCe)**
13-
- **MySql/MariaDB**
10+
- **Informix**: x64-bit version of LINQPad only
11+
- **Microsoft Access**: both OLE DB and ODBC drivers
12+
- **Microsoft SQL Server** 2005+ *(including **Microsoft SQL Azure**)*
13+
- **Microsoft SQL Server Compact (SQL CE)**
14+
- **MariaDB**
15+
- **MySql**
1416
- **Oracle**
1517
- **PostgreSQL**
16-
- **SQLite**
1718
- **SAP HANA** *(client software must be installed, supports both Native and ODBC providers)*
1819
- **SAP/Sybase ASE**
20+
- **SQLite**
1921

20-
### Installation
22+
## Installation
2123

2224
- Click "Add connection" in LINQPad.
2325
- In the "Choose Data Context" dialog, press the "View more drivers..." button.
@@ -26,4 +28,3 @@ Following databases supported:
2628
- In the "Choose Data Context" dialog, select the "LINQ to DB" driver and click the "Next" button.
2729
- In the "LINQ to DB connection" dialog, supply your connection information.
2830
- You're done.
29-

‎Build/azure-pipelines.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
variables:
22
solution: 'linq2db.LINQPad.sln'
33
build_configuration: 'Release'
4-
assemblyVersion: 4.2.0.0
5-
nugetVersion: 4.2.0
6-
nugetDevVersion: 4.2.1
7-
nugetPRVersion: 4.2.1
4+
assemblyVersion: 5.0.0.0
5+
nugetVersion: 5.0.0
6+
nugetDevVersion: 5.0.1
7+
nugetPRVersion: 5.0.1
88
artifact_lpx: 'lpx'
99
artifact_lpx6: 'lpx6'
1010
artifact_nuget: 'nuget'
@@ -98,7 +98,6 @@ stages:
9898
displayName: Publish to Azure Artifacts feed
9999
condition: eq(variables['Build.SourceBranchName'], 'master')
100100

101-
# apikey exires Oct/2020
102101
- task: NuGetCommand@2
103102
inputs:
104103
command: 'push'

‎Source/header.xml‎ renamed to ‎Build/header.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<DataContextDriver>
3-
<MainAssembly>linq2db.LINQPad.dll</MainAssembly>
4-
<SupportUri>https://github.com/linq2db/linq2db.LINQPad</SupportUri>
5-
</DataContextDriver>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<DataContextDriver>
3+
<MainAssembly>linq2db.LINQPad.dll</MainAssembly>
4+
<SupportUri>https://github.com/linq2db/linq2db.LINQPad</SupportUri>
5+
</DataContextDriver>

‎Build/linq2db.LINQPad.nuspec‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,51 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>linq2db.LINQPad</id>
5-
<title>LINQ to DB driver for LINQPad 6+</title>
6-
<description>Supported databases: IBM DB2 LUW/zOS, Firebird, IBM Informix, Microsoft Access, Microsoft Sql Server (+Azure), Microsoft Sql Server Compact, MySql, MariaDB, Oracle, PostgreSQL, SQLite, SAP HANA, SAP/Sybase ASE.</description>
5+
<title>LINQ to DB driver for LINQPad 7</title>
6+
<description>Supported databases: IBM DB2 LUW/zOS, Firebird, IBM Informix, Microsoft Access, Microsoft Sql Server (+Azure), Microsoft Sql Server Compact, MySql, MariaDB, Oracle, PostgreSQL, SQLite, SAP HANA, SAP/Sybase ASE, ClickHouse.</description>
77
<summary />
88
<tags>
9-
linqpaddriver linqpad linq2db linqtodb access msaccess db2 odbc oledb azure firebird informix mysql mariadb oracle postgres postgresql saphana sqlce sqlserverce sqlserver sybase ase sap sqlite database
9+
linqpaddriver linqpad linq2db linqtodb access msaccess db2 odbc oledb azure firebird informix mysql mariadb oracle postgres postgresql saphana sqlce sqlserverce sqlserver sybase ase sap sqlite database clickhouse iseries
1010
</tags>
1111
<readme>README.md</readme>
1212
<dependencies>
13-
<group targetFramework=".NETCoreApp3.1">
14-
<dependency id="LINQPad.Reference" version="1.3.0" />
15-
<dependency id="linq2db" version="4.2.0" />
13+
<group targetFramework="net6.0-windows">
14+
<dependency id="linq2db" version="5.1.1" />
15+
<dependency id="linq2db.Tools" version="5.1.1" />
1616

17-
<dependency id="Humanizer.Core" version="2.14.1" />
18-
<dependency id="CodeJam" version="4.1.0" />
19-
<dependency id="System.Configuration.ConfigurationManager" version="6.0.0" />
20-
<dependency id="Microsoft.CodeAnalysis.CSharp" version="4.3.0" />
21-
<dependency id="System.Text.Json" version="6.0.5" />
22-
<dependency id="dotMorten.Microsoft.SqlServer.Types" version="1.5.0" />
17+
<dependency id="LINQPad.Reference" version="1.3.0" />
2318

24-
<dependency id="FirebirdSql.Data.FirebirdClient" version="9.0.2" />
25-
<dependency id="MySqlConnector" version="2.1.13" />
26-
<dependency id="AdoNetCore.AseClient" version="0.19.2" />
27-
<dependency id="System.Data.SQLite.Core" version="1.0.116" />
28-
<dependency id="System.Data.SqlClient" version="4.8.3" />
29-
<dependency id="System.Data.Odbc" version="5.0.0" />
30-
<dependency id="System.Data.OleDb" version="5.0.0" />
31-
<dependency id="Npgsql" version="6.0.6" />
32-
<dependency id="Oracle.ManagedDataAccess.Core" version="3.21.70" />
33-
<dependency id="IBM.Data.DB2.Core" version="3.1.0.600" />
19+
<dependency id="System.Configuration.ConfigurationManager" version="7.0.0" />
20+
<dependency id="Microsoft.CodeAnalysis.CSharp" version="4.5.0" />
21+
<dependency id="System.Text.Json" version="7.0.2" />
22+
23+
<dependency id="FirebirdSql.Data.FirebirdClient" version="9.1.1" />
24+
<dependency id="MySqlConnector" version="2.2.5" />
25+
<dependency id="AdoNetCore.AseClient" version="0.19.2" />
26+
<dependency id="System.Data.SQLite.Core" version="1.0.117" />
27+
<dependency id="Microsoft.Data.SqlClient" version="5.1.1" />
28+
<dependency id="Microsoft.SqlServer.Types" version="160.1000.6" />
29+
<dependency id="System.Data.Odbc" version="7.0.0" />
30+
<dependency id="System.Data.OleDb" version="7.0.0" />
31+
<dependency id="Npgsql" version="7.0.2" />
32+
<dependency id="Oracle.ManagedDataAccess.Core" version="3.21.100" />
33+
<dependency id="Net.IBM.Data.Db2" version="6.0.0.300" />
34+
<dependency id="ClickHouse.Client" version="6.5.2" />
35+
<dependency id="Octonica.ClickHouseClient" version="2.2.9" />
36+
<!--<dependency id="linq2db4iSeries" version="4.3.0" />-->
3437
</group>
3538
</dependencies>
3639
<frameworkReferences>
37-
<group targetFramework=".NETCoreApp3.1">
40+
<group targetFramework="net6.0-windows">
3841
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
3942
</group>
4043
</frameworkReferences>
4144
</metadata>
4245

4346
<files>
44-
<file src="..\Source\bin\Release\netcoreapp3.1\linq2db.LINQPad.dll" target="lib\netcoreapp3.1\" />
45-
<file src="..\Source\bin\Release\netcoreapp3.1\Connection.png" target="lib\netcoreapp3.1\" />
46-
<file src="..\Source\bin\Release\netcoreapp3.1\FailedConnection.png" target="lib\netcoreapp3.1\" />
47-
<file src="README.md" />
47+
<file src="..\Source\bin\Release\net6.0-windows\linq2db.LINQPad.dll" target="lib\net6.0-windows\" />
48+
<file src="..\Source\bin\Release\net6.0-windows\Connection.png" target="lib\net6.0-windows\" />
49+
<file src="..\Source\bin\Release\net6.0-windows\FailedConnection.png" target="lib\net6.0-windows\" />
50+
<file src="README.md" />
4851
</files>
4952
</package>

0 commit comments

Comments
 (0)