Skip to content

Commit

Permalink
Merge branch 'hotfix/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
roji committed Sep 24, 2016
2 parents 12cada0 + 6e9d764 commit 9804025
Show file tree
Hide file tree
Showing 66 changed files with 1,041 additions and 8,630 deletions.
114 changes: 114 additions & 0 deletions Npgsql.EntityFrameworkCore.PostgreSQL-xproj.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}"
ProjectSection(SolutionItems) = preProject
CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
Npgsql.snk = Npgsql.snk
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Npgsql.EntityFrameworkCore.PostgreSQL", "src\Npgsql.EntityFrameworkCore.PostgreSQL\Npgsql.EntityFrameworkCore.PostgreSQL.xproj", "{A6370FDF-2140-4780-9671-FFCE9688A1AB}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore", "..\EntityFramework\src\Microsoft.EntityFrameworkCore\Microsoft.EntityFrameworkCore.xproj", "{45C6A6D2-AD42-4CFE-BF5C-A56ECB8563BD}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Relational\Microsoft.EntityFrameworkCore.Relational.xproj", "{539436BC-9F4B-4492-8ECC-4451E0C3FDEC}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Design", "src\Npgsql.EntityFrameworkCore.PostgreSQL.Design\Npgsql.EntityFrameworkCore.PostgreSQL.Design.xproj", "{180FC3CA-E92E-4B89-8A3A-81302F088F2E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Design.Core", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Design.Core\Microsoft.EntityFrameworkCore.Design.Core.xproj", "{6C155372-A8A1-4E3B-8808-E875AFE452C8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Design", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Relational.Design\Microsoft.EntityFrameworkCore.Relational.Design.xproj", "{0B4B5871-2017-40CA-B190-AEDB974D843D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Tests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.Tests\Npgsql.EntityFrameworkCore.PostgreSQL.Tests.xproj", "{6584213E-212A-4262-810D-E121A7E737F1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.InMemory", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.InMemory\Microsoft.EntityFrameworkCore.InMemory.xproj", "{B082A621-EF4B-415B-B8C2-BE4EEE791B52}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Specification.Tests", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Relational.Specification.Tests\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.xproj", "{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Specification.Tests", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Specification.Tests\Microsoft.EntityFrameworkCore.Specification.Tests.xproj", "{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests\Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests.xproj", "{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests\Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests.xproj", "{67553B48-F896-4D76-9210-95AAE6707F60}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests", "..\EntityFramework\src\Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests\Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.xproj", "{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A6370FDF-2140-4780-9671-FFCE9688A1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6370FDF-2140-4780-9671-FFCE9688A1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6370FDF-2140-4780-9671-FFCE9688A1AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6370FDF-2140-4780-9671-FFCE9688A1AB}.Release|Any CPU.Build.0 = Release|Any CPU
{45C6A6D2-AD42-4CFE-BF5C-A56ECB8563BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45C6A6D2-AD42-4CFE-BF5C-A56ECB8563BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45C6A6D2-AD42-4CFE-BF5C-A56ECB8563BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45C6A6D2-AD42-4CFE-BF5C-A56ECB8563BD}.Release|Any CPU.Build.0 = Release|Any CPU
{539436BC-9F4B-4492-8ECC-4451E0C3FDEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{539436BC-9F4B-4492-8ECC-4451E0C3FDEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{539436BC-9F4B-4492-8ECC-4451E0C3FDEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{539436BC-9F4B-4492-8ECC-4451E0C3FDEC}.Release|Any CPU.Build.0 = Release|Any CPU
{180FC3CA-E92E-4B89-8A3A-81302F088F2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{180FC3CA-E92E-4B89-8A3A-81302F088F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{180FC3CA-E92E-4B89-8A3A-81302F088F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{180FC3CA-E92E-4B89-8A3A-81302F088F2E}.Release|Any CPU.Build.0 = Release|Any CPU
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Release|Any CPU.Build.0 = Release|Any CPU
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Release|Any CPU.Build.0 = Release|Any CPU
{6584213E-212A-4262-810D-E121A7E737F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6584213E-212A-4262-810D-E121A7E737F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6584213E-212A-4262-810D-E121A7E737F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6584213E-212A-4262-810D-E121A7E737F1}.Release|Any CPU.Build.0 = Release|Any CPU
{B082A621-EF4B-415B-B8C2-BE4EEE791B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B082A621-EF4B-415B-B8C2-BE4EEE791B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B082A621-EF4B-415B-B8C2-BE4EEE791B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B082A621-EF4B-415B-B8C2-BE4EEE791B52}.Release|Any CPU.Build.0 = Release|Any CPU
{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}.Release|Any CPU.Build.0 = Release|Any CPU
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Release|Any CPU.Build.0 = Release|Any CPU
{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE}.Release|Any CPU.Build.0 = Release|Any CPU
{67553B48-F896-4D76-9210-95AAE6707F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67553B48-F896-4D76-9210-95AAE6707F60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67553B48-F896-4D76-9210-95AAE6707F60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67553B48-F896-4D76-9210-95AAE6707F60}.Release|Any CPU.Build.0 = Release|Any CPU
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A6370FDF-2140-4780-9671-FFCE9688A1AB} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{180FC3CA-E92E-4B89-8A3A-81302F088F2E} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{6584213E-212A-4262-810D-E121A7E737F1} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
{2FF9C05F-BBF1-4AE0-AB73-017751DEF4DE} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
{67553B48-F896-4D76-9210-95AAE6707F60} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Npgsql.csproj
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
</packageRestore>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
</packageSources>
</configuration>
5 changes: 5 additions & 0 deletions bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ if [[ $v == *"-"* ]]; then
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$without_prerelease'")/' src/Shared/CommonAssemblyInfo.cs
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$without_prerelease'")/' src/Shared/CommonAssemblyInfo.cs
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs

sed -i 's/assemblyName: "Npgsql.EntityFrameworkCore.PostgreSQL.Design, Version=[0-9.]*/assemblyName: "Npgsql.EntityFrameworkCore.PostgreSQL.Design, Version='$without_prerelease'.0/' src/Npgsql.EntityFrameworkCore.PostgreSQL/Properties/AssemblyInfo.cs
else
# Release version

Expand All @@ -33,11 +35,14 @@ else
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs

sed -i 's/assemblyName: "Npgsql.EntityFrameworkCore.PostgreSQL.Design, Version=[0-9.]*/assemblyName: "Npgsql.EntityFrameworkCore.PostgreSQL.Design, Version='$v'.0/' src/Npgsql.EntityFrameworkCore.PostgreSQL/Properties/AssemblyInfo.cs
fi

git add teamcity_set_version.cmd
git add src/Npgsql.EntityFrameworkCore.PostgreSQL/project.json
git add src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/project.json
git add src/Shared/CommonAssemblyInfo.cs
git add src/Npgsql.EntityFrameworkCore.PostgreSQL/Properties/AssemblyInfo.cs

git commit -m "Bump version to $v"
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ protected override void Generate([NotNull] MigrationOperation operation, [NotNul
Check.NotNull(operation, nameof(operation));
Check.NotNull(builder, nameof(builder));

var asCreateExtensionOperation = operation as NpgsqlCreatePostgresExtensionOperation;
var asCreateExtensionOperation = operation as NpgsqlEnsurePostgresExtensionOperation;
if (asCreateExtensionOperation != null)
{
Generate(asCreateExtensionOperation, builder);
Expand All @@ -45,12 +45,12 @@ protected override void Generate([NotNull] MigrationOperation operation, [NotNul
throw new InvalidOperationException(DesignCoreStrings.UnknownOperation(operation.GetType()));
}

protected virtual void Generate([NotNull] NpgsqlCreatePostgresExtensionOperation operation, [NotNull] IndentedStringBuilder builder)
protected virtual void Generate([NotNull] NpgsqlEnsurePostgresExtensionOperation operation, [NotNull] IndentedStringBuilder builder)
{
Check.NotNull(operation, nameof(operation));
Check.NotNull(builder, nameof(builder));

builder.Append(".CreatePostgresExtension(");
builder.Append(".EnsurePostgresExtension(");

if (operation.Schema == null && operation.Version == null)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dependencies" : {
"Microsoft.EntityFrameworkCore": "1.0.0",
"Microsoft.EntityFrameworkCore": "1.0.1",
"Microsoft.EntityFrameworkCore.Design.Core": "1.0.0-preview2-final",
"Microsoft.EntityFrameworkCore.Relational": "1.0.0",
"Microsoft.EntityFrameworkCore.Relational.Design": "1.0.0",
"Microsoft.EntityFrameworkCore.Relational": "1.0.1",
"Microsoft.EntityFrameworkCore.Relational.Design": "1.0.1",
"Microsoft.Extensions.DependencyInjection": "1.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
"Npgsql": "3.1.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding
{
public class NpgsqlDatabaseModelFactory : IDatabaseModelFactory
{
private NpgsqlConnection _connection;
private TableSelectionSet _tableSelectionSet;
private DatabaseModel _databaseModel;
private Dictionary<string, TableModel> _tables;
private Dictionary<string, ColumnModel> _tableColumns;
NpgsqlConnection _connection;
TableSelectionSet _tableSelectionSet;
DatabaseModel _databaseModel;
Dictionary<string, TableModel> _tables;
Dictionary<string, ColumnModel> _tableColumns;

private static string TableKey(TableModel table) => TableKey(table.Name, table.SchemaName);
private static string TableKey(string name, string schema) => $"\"{schema}\".\"{name}\"";
private static string ColumnKey(TableModel table, string columnName) => $"{TableKey(table)}.\"{columnName}\"";
static string TableKey(TableModel table) => TableKey(table.Name, table.SchemaName);
static string TableKey(string name, string schema) => $"\"{schema}\".\"{name}\"";
static string ColumnKey(TableModel table, string columnName) => $"{TableKey(table)}.\"{columnName}\"";

public NpgsqlDatabaseModelFactory([NotNull] ILoggerFactory loggerFactory)
{
Expand All @@ -56,7 +56,7 @@ public NpgsqlDatabaseModelFactory([NotNull] ILoggerFactory loggerFactory)

public virtual ILogger Logger { get; }

private void ResetState()
void ResetState()
{
_connection = null;
_tableSelectionSet = null;
Expand Down Expand Up @@ -434,6 +434,9 @@ void GetSequences()
IsCyclic = reader.GetBoolean(7)
};

if (!_tableSelectionSet.Allows(sequence.SchemaName, ""))
continue;

if (sequence.DataType == "bigint")
{
long defaultStart, defaultMin, defaultMax;
Expand All @@ -449,20 +452,15 @@ void GetSequences()
Debug.Assert(sequence.Max.HasValue);
defaultStart = sequence.Max.Value;
}
if (sequence.Start == defaultStart) {
if (sequence.Start == defaultStart)
sequence.Start = null;
}
if (sequence.Min == defaultMin) {
if (sequence.Min == defaultMin)
sequence.Min = null;
}
if (sequence.Max == defaultMax) {
if (sequence.Max == defaultMax)
sequence.Max = null;
}
}
else
{
Logger.LogWarning($"Sequence with datatype {sequence.DataType} which isn't the expected bigint.");
}

_databaseModel.Sequences.Add(sequence);
}
Expand Down
12 changes: 6 additions & 6 deletions src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.1",
"version": "1.0.2",
"packOptions": {
"authors": [ "Shay Rojansky" ],
"description": "Design-time Entity Framework Core Functionality for PostgreSQL",
Expand All @@ -18,14 +18,14 @@
}
},
"dependencies" : {
"Microsoft.EntityFrameworkCore": "1.0.0",
"Microsoft.EntityFrameworkCore": "1.0.1",
"Microsoft.EntityFrameworkCore.Design.Core": "1.0.0-preview2-final",
"Microsoft.EntityFrameworkCore.Relational": "1.0.0",
"Microsoft.EntityFrameworkCore.Relational.Design": "1.0.0",
"Microsoft.EntityFrameworkCore.Relational": "1.0.1",
"Microsoft.EntityFrameworkCore.Relational.Design": "1.0.1",
"Microsoft.Extensions.DependencyInjection": "1.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
"Npgsql.EntityFrameworkCore.PostgreSQL": "1.0.0",
"Npgsql": "3.1.5"
"Npgsql.EntityFrameworkCore.PostgreSQL": "1.0.2-*",
"Npgsql": "3.1.8"
},
"frameworks": {
"net451": {},
Expand Down
Loading

0 comments on commit 9804025

Please sign in to comment.