File tree Expand file tree Collapse file tree 2 files changed +444
-5
lines changed
src/EFCore.PG/ValueGeneration/Internal
test/EFCore.PG.FunctionalTests Expand file tree Collapse file tree 2 files changed +444
-5
lines changed Original file line number Diff line number Diff line change 55using Microsoft . EntityFrameworkCore . Metadata ;
66using Microsoft . EntityFrameworkCore . Storage ;
77using Microsoft . EntityFrameworkCore . ValueGeneration ;
8- using Npgsql . EntityFrameworkCore . PostgreSQL . Utilities ;
98
109namespace Npgsql . EntityFrameworkCore . PostgreSQL . ValueGeneration . Internal
1110{
@@ -35,17 +34,24 @@ public virtual NpgsqlSequenceValueGeneratorState GetOrAddSequenceState(
3534 IProperty property ,
3635 IRelationalConnection connection )
3736 {
38- //var sequence = property.GetNpgsql().FindHiLoSequence();
3937 var sequence = property . FindHiLoSequence ( ) ;
4038
4139 Debug . Assert ( sequence != null ) ;
4240
4341 return _sequenceGeneratorCache . GetOrAdd (
44- GetSequenceName ( sequence ) ,
42+ GetSequenceName ( sequence , connection ) ,
4543 sequenceName => new NpgsqlSequenceValueGeneratorState ( sequence ) ) ;
4644 }
4745
48- static string GetSequenceName ( ISequence sequence )
49- => ( sequence . Schema == null ? "" : sequence . Schema + "." ) + sequence . Name ;
46+ static string GetSequenceName ( ISequence sequence , IRelationalConnection connection )
47+ {
48+ var dbConnection = connection . DbConnection ;
49+
50+ return dbConnection . Database . ToUpperInvariant ( )
51+ + "::"
52+ + dbConnection . DataSource ? . ToUpperInvariant ( )
53+ + "::"
54+ + ( sequence . Schema == null ? "" : sequence . Schema + "." ) + sequence . Name ;
55+ }
5056 }
5157}
You can’t perform that action at this time.
0 commit comments