Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: npgsql/EntityFramework6.Npgsql
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.1
Choose a base ref
...
head repository: npgsql/EntityFramework6.Npgsql
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
15 contributors

Commits on May 23, 2016

  1. Bump version to 3.1.1-ci

    @roji
    roji committed May 23, 2016
    Copy the full SHA
    cdfa61b View commit details

  2. TeamCity change in 'EntityFramework6.Npgsql' project: runners of 'Bui… 

    …ld' build configuration were updated
    roji authored and teamcity committed May 23, 2016
    Copy the full SHA
    043f767 View commit details

Commits on May 26, 2016

  1. General cleanup/cosmetics 

    C# 6 and so on
    @roji
    roji committed May 26, 2016
    Copy the full SHA
    7689c80 View commit details

Commits on Jul 8, 2016

  1. POSIX regular expressions operators

    @PSeON
    PSeON committed Jul 8, 2016
    Copy the full SHA
    4214de4 View commit details

  2. Merge pull request #41 from PSeON/dev 

    POSIX regular expressions operators
    @roji
    roji authored Jul 8, 2016
    Copy the full SHA
    7c5a096 View commit details

  3. Fix #27 by casting literal strings in projection lists + explicit cas… 

    …t function + tests.
    @rwasef1830
    rwasef1830 committed Jul 8, 2016
    Copy the full SHA
    e1689b9 View commit details

Commits on Jul 9, 2016

  1. Merge pull request #36 from rwasef1830/bug_27_literal_varchar_in_proj… 

    …ection_lists_only

Fix #27 by casting literal strings to varchar in projection lists only
    @roji
    roji authored Jul 9, 2016
    Copy the full SHA
    c203687 View commit details

Commits on Jul 12, 2016

  1. Adds table valued functions support

    @neisbut
    neisbut committed Jul 12, 2016
    Copy the full SHA
    890f3dd View commit details

  2. Merge pull request #38 from neisbut/dev 

    Adds table valued functions support
    @rwasef1830
    rwasef1830 authored Jul 12, 2016
    Copy the full SHA
    3d59c71 View commit details

Commits on Jul 14, 2016

  1. Depend on EF 6.1.0 

    Otherwise we get:
Could not load type 'System.Data.Entity.Migrations.Model.RenameIndexOperation'

Fixes #44
    @roji
    roji committed Jul 14, 2016
    Copy the full SHA
    13b535b View commit details

Commits on Dec 12, 2016

  1. Add docfx conceptual docs 

    (cherry picked from commit ccf3aa8)
    @roji
    roji committed Dec 12, 2016
    Copy the full SHA
    c6702ce View commit details

  2. Fix SSL/Certificate authentication 

    See ticket #59
    @syserr0r
    syserr0r authored Dec 12, 2016
    Copy the full SHA
    767f11f View commit details

  3. Merge pull request #61 from syserr0r/patch-1 

    Fix SSL/Certificate authentication
    @roji
    roji authored Dec 12, 2016
    Copy the full SHA
    b4e0e91 View commit details

Commits on Jan 20, 2017

  1. Access conn properties via settings 

    We were accessing 2 EF6-specific connection string params via
properties on NpgsqlConnection. Access them via the connection's
settings instead.
    @roji
    roji committed Jan 20, 2017
    Copy the full SHA
    2041bfd View commit details

Commits on Feb 16, 2017

  1. Document the possibility of using EF6 interceptors.

    @rwasef1830
    rwasef1830 committed Feb 16, 2017
    Copy the full SHA
    db877ea View commit details

  2. Merge pull request #65 from rwasef1830/doc_ef6_interceptor_example 

    Document the possibility of using EF6 interceptors
    @roji
    roji authored Feb 16, 2017
    Copy the full SHA
    ce6c4d7 View commit details

Commits on Sep 10, 2017

  1. Add quotes to schema and table names (#74) 

    * Fixes #72
    @piksel @rwasef1830
    piksel authored and rwasef1830 committed Sep 10, 2017
    Copy the full SHA
    8772228 View commit details

  2. Ignore empty schema string. Fixes #72. (original pull request: #75).

    @rwasef1830
    superfuego authored and rwasef1830 committed Sep 10, 2017
    Copy the full SHA
    42393c1 View commit details

  3. Merge pull request #77 from rwasef1830/fix_72 

    Ignore empty schema string. Fixes #72. (original pull request: #75).
    @rwasef1830
    rwasef1830 authored Sep 10, 2017
    Copy the full SHA
    a2ed59f View commit details

Commits on Sep 17, 2017

  1. Depend on Npgsql 3.2.5

    @roji
    roji committed Sep 17, 2017
    Copy the full SHA
    0845a5e View commit details

  2. Depend on NUnit 3.8.1

    @roji
    roji committed Sep 17, 2017
    Copy the full SHA
    3b82c96 View commit details

  3. Depend on NLog 4.4.12

    @roji
    roji committed Sep 17, 2017
    Copy the full SHA
    483523f View commit details

  4. Fix whitespace

    @roji
    roji committed Sep 17, 2017
    Copy the full SHA
    91492ec View commit details

  5. Bump version to 3.2.0

    @roji
    roji committed Sep 17, 2017
    Copy the full SHA
    6280338 View commit details

Commits on Sep 18, 2017

  1. Fix test regression due to #77.

    @rwasef1830
    rwasef1830 committed Sep 18, 2017
    Copy the full SHA
    e1a7c48 View commit details

  2. Merge pull request #80 from rwasef1830/fix_test_regression_due_to_77 

    Fix test regression due to #77
    @rwasef1830
    rwasef1830 authored Sep 18, 2017
    Copy the full SHA
    172e589 View commit details

Commits on Sep 22, 2017

  1. Remove explicit default value for not nullable columns 

    # Conflicts:
#	test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs
    @xklonx @rwasef1830
    xklonx authored and rwasef1830 committed Sep 22, 2017
    Copy the full SHA
    c1cf255 View commit details

Commits on Jun 1, 2018

  1. Translate 'case when X is null...' to 'coalesce(X,...)'.

    @bgurmendi @rwasef1830
    bgurmendi authored and rwasef1830 committed Jun 1, 2018
    Copy the full SHA
    11f1cbd View commit details

  2. Add support for tsquery_phrase which was added in PostgreSQL 9.6

    @rwasef1830
    rwasef1830 committed Jun 1, 2018
    Copy the full SHA
    796da44 View commit details

Commits on Jun 28, 2018

  1. Tweak license file 

    To make github recognize it
    @roji
    roji committed Jun 28, 2018
    Copy the full SHA
    0bf9deb View commit details

Commits on Jul 7, 2018

  1. Add .vs to .gitignore

    @roji
    roji committed Jul 7, 2018
    Copy the full SHA
    0f179c4 View commit details

  2. Switch to new csproj, drop EF5 

    Closes #102, #101
    @roji
    roji committed Jul 7, 2018
    Copy the full SHA
    9a737da View commit details

  3. Code quality improvements 

    C# 7 etc.
    @roji
    roji committed Jul 7, 2018
    Copy the full SHA
    b63d003 View commit details

  4. Depend on EF 6.2.0

    @roji
    roji committed Jul 7, 2018
    Copy the full SHA
    d0a5ccc View commit details

Commits on Jul 8, 2018

  1. Update NUnit, set up cmdline testing

    @roji
    roji committed Jul 8, 2018
    Copy the full SHA
    9722eab View commit details

  2. Depend on Npgsql 4.0.2

    @roji
    roji committed Jul 8, 2018
    Copy the full SHA
    2d783a9 View commit details

  3. Remove old TeamCity config

    @roji
    roji committed Jul 8, 2018
    Copy the full SHA
    3a4c675 View commit details

Commits on Jul 9, 2018

  1. added documentation paragraph.

    Sam committed Jul 9, 2018
    Copy the full SHA
    08e00f1 View commit details

  2. fixed spelling mistake

    Sam committed Jul 9, 2018
    Copy the full SHA
    a2a6ba9 View commit details

Commits on Jul 10, 2018

  1. refactored based on review 

    + renamed title.
+ rephrased sentence.
+ added csharp snippet styling.
+ added line snippets to classes.
+ included namespaces required.
    Sam committed Jul 10, 2018
    Copy the full SHA
    374c357 View commit details

  2. added named parameters

    Sam committed Jul 10, 2018
    Copy the full SHA
    b00d153 View commit details

Commits on Jul 27, 2018

  1. Add "getting started" documentation (#103)

    @austindrenski
    austindrenski authored Jul 27, 2018
    Copy the full SHA
    1a76a29 View commit details

Commits on Apr 16, 2019

  1. Convert enum values to workaround Npgsql > 4.0 strict type checking. F… 

    …ixes #105
    @rwasef1830
    rwasef1830 committed Apr 16, 2019
    Copy the full SHA
    428fb5d View commit details

Commits on May 20, 2019

  1. Update copyright to 2019

    @roji
    roji committed May 20, 2019
    Copy the full SHA
    f58b068 View commit details

  2. Depend on .NET Framework targeting pack nugets 

    Depend on .NET Framework reference assemblies via the new nuget
packages. This allows us to build .NET Framework on systems where
.NET Framework isn't installed (e.g. Linux).
    @roji
    roji committed May 20, 2019
    Copy the full SHA
    0a804a8 View commit details

  3. Remove license header from source files

    @roji
    roji committed May 20, 2019
    Copy the full SHA
    17ed69a View commit details

  4. Add .idea to .gitignore

    @roji
    roji committed May 20, 2019
    Copy the full SHA
    b0e7264 View commit details

Commits on May 21, 2019

  1. Depend on Npgsql 4.0.7

    @roji
    roji committed May 21, 2019
    Copy the full SHA
    7621572 View commit details

  2. Update test dependencies

    @roji
    roji committed May 21, 2019
    Copy the full SHA
    ce97536 View commit details

  3. Switch to PackageLicenseExpression in nuget

    @roji
    roji committed May 21, 2019
    Copy the full SHA
    90417e1 View commit details
Showing with 5,489 additions and 6,694 deletions.
  1. +2 −0 .gitignore
  2. +0 −136 .teamcity/EntityFramework6Npgsql/buildTypes/EntityFramework6Npgsql_Build.xml
  3. +0 −5 .teamcity/EntityFramework6Npgsql/pluginData/plugin-settings.xml
  4. +0 −10 .teamcity/EntityFramework6Npgsql/project-config.xml
  5. +0 −19 .teamcity/EntityFramework6Npgsql/vcsRoots/EntityFramework6Npgsql_Github.xml
  6. +14 −0 Directory.Build.props
  7. +24 −0 Directory.Build.targets
  8. +3 −11 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/App.config
  9. +19 −0 EF6.PG.Tests/EF6.PG.Tests.csproj
  10. +290 −26 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/EntityFrameworkBasicTests.cs
  11. +41 −36 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/EntityFrameworkMigrationTests.cs
  12. +27 −24 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/FullTextSearchTests.cs
  13. +1 −24 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/NLogLoggingProvider.cs
  14. +141 −0 EF6.PG.Tests/PatternMatchingTests.cs
  15. +2 −1 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/Spatial/PostgisServiceTests.cs
  16. +30 −0 EF6.PG.Tests/Support/AssemblySetup.cs
  17. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/Support/CodeAnnotations.cs
  18. +407 −0 EF6.PG.Tests/Support/EntityFrameworkTestBase.cs
  19. +1 −45 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/Support/TestBase.cs
  20. +15 −0 EF6.PG.Tests/Support/TestDbConfiguration.cs
  21. +1 −24 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/Support/TestUtil.cs
  22. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/xmlModel/XmlTest.ObjectLayer.EF6.cs
  23. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/xmlModel/XmlTest.ObjectLayer.cs
  24. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/xmlModel/XmlTest.csdl
  25. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/xmlModel/XmlTest.msl
  26. 0 {test/EntityFramework6.Npgsql.Tests → EF6.PG.Tests}/xmlModel/XmlTest.ssdl
  27. 0 {src/EntityFramework6.Npgsql → EF6.PG}/App.config
  28. +56 −0 EF6.PG/EF6.PG.csproj
  29. +21 −0 EF6.PG/NpgsqlConnectionFactory.cs
  30. +312 −400 {src/EntityFramework6.Npgsql → EF6.PG}/NpgsqlMigrationSqlGenerator.cs
  31. +382 −0 EF6.PG/NpgsqlProviderManifest.cs
  32. 0 {src/EntityFramework6.Npgsql → EF6.PG}/NpgsqlRankingNormalization.cs
  33. +186 −0 EF6.PG/NpgsqlServices.cs
  34. +75 −124 {src/EntityFramework6.Npgsql → EF6.PG}/NpgsqlTextFunctions.cs
  35. +20 −0 EF6.PG/NpgsqlTypeFunctions.cs
  36. 0 {src/EntityFramework6.Npgsql → EF6.PG}/NpgsqlWeightLabel.cs
  37. +11 −0 EF6.PG/Properties/AssemblyInfo.cs
  38. 0 {src/EntityFramework6.Npgsql → EF6.PG/Resources}/NpgsqlProviderManifest.Manifest.xml
  39. 0 {src/EntityFramework6.Npgsql → EF6.PG/Resources}/NpgsqlSchema.msl
  40. +3 −3 {src/EntityFramework6.Npgsql → EF6.PG/Resources}/NpgsqlSchema.ssdl
  41. +3 −3 {src/EntityFramework6.Npgsql → EF6.PG/Resources}/NpgsqlSchemaV3.ssdl
  42. +36 −221 {src/EntityFramework6.Npgsql → EF6.PG}/Spatial/PostgisDataReader.cs
  43. +1,283 −0 EF6.PG/Spatial/PostgisServices.cs
  44. +42 −0 EF6.PG/SqlGenerators/PendingProjectsNode.cs
  45. +1,460 −0 EF6.PG/SqlGenerators/SqlBaseGenerator.cs
  46. +37 −0 EF6.PG/SqlGenerators/SqlDeleteGenerator.cs
  47. +22 −0 EF6.PG/SqlGenerators/SqlFunctionGenerator.cs
  48. +47 −0 EF6.PG/SqlGenerators/SqlInsertGenerator.cs
  49. +22 −53 {src/EntityFramework6.Npgsql → EF6.PG}/SqlGenerators/SqlSelectGenerator.cs
  50. +41 −0 EF6.PG/SqlGenerators/SqlUpdateGenerator.cs
  51. +35 −0 EF6.PG/SqlGenerators/StringPair.cs
  52. +277 −434 {src/EntityFramework6.Npgsql → EF6.PG}/SqlGenerators/VisitedExpression.cs
  53. +9 −0 EF6.PG/content/App.config.install.xdt
  54. +9 −0 EF6.PG/content/Web.config.install.xdt
  55. +11 −0 EF6.PG/content/net45/App.config.transform
  56. +11 −0 EF6.PG/content/net45/Web.config.transform
  57. +11 −0 EF6.PG/content/net461/App.config.transform
  58. +11 −0 EF6.PG/content/net461/Web.config.transform
  59. BIN EF6.PG/postgresql.png
  60. +9 −21 EntityFramework6.Npgsql.sln
  61. +7 −0 EntityFramework6.Npgsql.sln.DotSettings
  62. +17 −0 LICENSE
  63. +0 −7 LICENSE.txt
  64. +5 −0 README.md
  65. +0 −43 bump.sh
  66. +0 −21 src/CommonAssemblyInfo.cs
  67. +0 −17 src/EntityFramework5.Npgsql/App.config
  68. +0 −83 src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj
  69. +0 −29 src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.nuspec
  70. +0 −4 src/EntityFramework5.Npgsql/packages.config
  71. +0 −94 src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj
  72. +0 −30 src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec
  73. +0 −44 src/EntityFramework6.Npgsql/NpgsqlConnectionFactory.cs
  74. +0 −442 src/EntityFramework6.Npgsql/NpgsqlProviderManifest.cs
  75. +0 −210 src/EntityFramework6.Npgsql/NpgsqlServices.cs
  76. +0 −15 src/EntityFramework6.Npgsql/Properties/AssemblyInfo.cs
  77. +0 −13 src/EntityFramework6.Npgsql/PublisherPolicy.config
  78. +0 −13 src/EntityFramework6.Npgsql/PublisherPolicyLegacy.config
  79. +0 −1,826 src/EntityFramework6.Npgsql/Spatial/PostgisServices.cs
  80. +0 −73 src/EntityFramework6.Npgsql/SqlGenerators/PendingProjectsNode.cs
  81. +0 −1,431 src/EntityFramework6.Npgsql/SqlGenerators/SqlBaseGenerator.cs
  82. +0 −67 src/EntityFramework6.Npgsql/SqlGenerators/SqlDeleteGenerator.cs
  83. +0 −76 src/EntityFramework6.Npgsql/SqlGenerators/SqlInsertGenerator.cs
  84. +0 −75 src/EntityFramework6.Npgsql/SqlGenerators/SqlUpdateGenerator.cs
  85. +0 −65 src/EntityFramework6.Npgsql/SqlGenerators/StringPair.cs
  86. +0 −3 src/EntityFramework6.Npgsql/install.ps1
  87. +0 −5 src/EntityFramework6.Npgsql/packages.config
  88. +0 −1 teamcity_set_version.cmd
  89. +0 −104 test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj
  90. +0 −22 test/EntityFramework6.Npgsql.Tests/Program.cs
  91. +0 −54 test/EntityFramework6.Npgsql.Tests/Properties/AssemblyInfo.cs
  92. +0 −200 test/EntityFramework6.Npgsql.Tests/Support/EntityFrameworkTestBase.cs
  93. +0 −7 test/EntityFramework6.Npgsql.Tests/packages.config
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
*.sln.docstates
*.userprefs
/*.nupkg
.idea/
.nuget/
[Bb]in/
[Bb]uild/
@@ -18,3 +19,4 @@ artifacts/
*.lock.json
.build
TestResult.xml
.vs/
136 changes: 0 additions & 136 deletions .teamcity/EntityFramework6Npgsql/buildTypes/EntityFramework6Npgsql_Build.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions .teamcity/EntityFramework6Npgsql/pluginData/plugin-settings.xml
View file

This file was deleted.

10 changes: 0 additions & 10 deletions .teamcity/EntityFramework6Npgsql/project-config.xml
View file

This file was deleted.

19 changes: 0 additions & 19 deletions .teamcity/EntityFramework6Npgsql/vcsRoots/EntityFramework6Npgsql_Github.xml
View file

This file was deleted.

14 changes: 14 additions & 0 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project>

<PropertyGroup>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
(e.g. Linux). Gets ignored on non-framework TFMs. -->
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

</Project>
24 changes: 24 additions & 0 deletions Directory.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<!-- Any update of these version must be accompanied by the appropriate
change in EF6.PG/content -->
<PackageReference Update="Npgsql" Version="4.1.3" />
<PackageReference Update="Npgsql.LegacyPostgis" Version="4.1.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<!-- Any update of these version must be accompanied by the appropriate
change in EF6.PG/content -->
<PackageReference Update="Npgsql" Version="4.0.10" />
<PackageReference Update="Npgsql.LegacyPostgis" Version="4.0.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="EntityFramework" Version="6.4.0" />

<PackageReference Update="NUnit" Version="3.12.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Update="NLog" Version="4.6.7" />
</ItemGroup>
</Project>
14 changes: 3 additions & 11 deletions .../EntityFramework6.Npgsql.Tests/App.config → EF6.PG.Tests/App.config
View file
Original file line number Diff line number Diff line change
@@ -28,17 +28,9 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
<assemblyIdentity name="Npgsql" publicKeyToken="5d8b90d52f46fda7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
19 changes: 19 additions & 0 deletions EF6.PG.Tests/EF6.PG.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<LangVersion>latest</LangVersion>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<RootNamespace>EntityFramework6.Npgsql.Tests</RootNamespace>
<AssemblyName>EntityFramework6.Npgsql.Tests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EntityFramework" />
<PackageReference Include="NUnit" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="NLog" />
<PackageReference Include="Npgsql.LegacyPostgis" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EF6.PG\EF6.PG.csproj" />
</ItemGroup>
</Project>
Loading