Ticket #13 : Fix empty key

habarthierry-hue · habarthierry-hue · commit c525400bcea0 · 2020-11-12T12:03:12.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>2.0.3</VersionPrefix>
+        <VersionPrefix>2.0.4</VersionPrefix>
         <Authors>SimpleIdServer</Authors>
         <Owners>SimpleIdServer</Owners>
     </PropertyGroup>
diff --git a/samples/EFCore.Cassandra.Samples/FakeDbContext.cs b/samples/EFCore.Cassandra.Samples/FakeDbContext.cs
@@ -10,13 +10,14 @@ namespace EFCore.Cassandra.Samples
 {
     public class FakeDbContext : DbContext
     {
+        private const string CV_KEYSPACE = "cv";
         public DbSet<Applicant> Applicants { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseCassandra("Contact Points=127.0.0.1;", opt =>
+            optionsBuilder.UseCassandra($"Contact Points=127.0.0.1", CV_KEYSPACE, opt =>
             {
-                opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "cv");
+                opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, CV_KEYSPACE);
             }, b =>
             {
                 b.WithQueryOptions(new QueryOptions().SetConsistencyLevel(ConsistencyLevel.LocalOne))
@@ -38,9 +39,9 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             var timeUuidConverter = new TimeUuidToGuidConverter();
-            modelBuilder.ForCassandraAddKeyspace("cv", new KeyspaceReplicationSimpleStrategyClass(2));
+            modelBuilder.ForCassandraAddKeyspace(CV_KEYSPACE, new KeyspaceReplicationSimpleStrategyClass(2));
             modelBuilder.Entity<Applicant>()
-                .ToTable("applicants", "cv")
+                .ToTable("applicants", CV_KEYSPACE)
                 .HasKey(p => new { p.Id, p.Order });
             modelBuilder.Entity<Applicant>()
                 .ForCassandraSetClusterColumns(_ => _.Order)
@@ -52,10 +53,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .Property(p => p.Id)
                 .HasColumnName("id");
             modelBuilder.Entity<CV>()
-                .ToTable("cvs", "cv")
+                .ToTable("cvs", CV_KEYSPACE)
                 .HasKey(c => c.Id);
             modelBuilder.Entity<ApplicantAddress>()
-                .ToUserDefinedType("applicant_addr", "cv")
+                .ToUserDefinedType("applicant_addr", CV_KEYSPACE)
                 .HasNoKey();
         }
     }
diff --git a/src/EFCore.Cassandra.Benchmarks/FakeDbContext.cs b/src/EFCore.Cassandra.Benchmarks/FakeDbContext.cs
@@ -10,13 +10,14 @@ namespace EFCore.Cassandra.Benchmarks
 {
     public class FakeDbContext : DbContext
     {
+        private const string CV_KEYSPACE = "cv";
         public DbSet<Applicant> Applicants { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseCassandra("Contact Points=127.0.0.1;", opt =>
+            optionsBuilder.UseCassandra("Contact Points=127.0.0.1;", CV_KEYSPACE, opt =>
             {
-                opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "cv");
+                opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, CV_KEYSPACE);
             }, o => {
 
                 o.WithQueryOptions(new QueryOptions().SetConsistencyLevel(ConsistencyLevel.LocalOne))
@@ -38,9 +39,9 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             var timeUuidConverter = new TimeUuidToGuidConverter();
-            modelBuilder.ForCassandraAddKeyspace("cv", new KeyspaceReplicationSimpleStrategyClass(2));
+            modelBuilder.ForCassandraAddKeyspace("CV_KEYSPACE", new KeyspaceReplicationSimpleStrategyClass(2));
             modelBuilder.Entity<Applicant>()
-                .ToTable("applicants", "cv")
+                .ToTable("applicants", CV_KEYSPACE)
                 .HasKey(p => new { p.Id, p.Order });
             modelBuilder.Entity<Applicant>()
                 .ForCassandraSetClusterColumns(_ => _.Order)
@@ -52,7 +53,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .Property(p => p.Id)
                 .HasColumnName("id");
             modelBuilder.Entity<ApplicantAddress>()
-                .ToUserDefinedType("applicant_addr", "cv")
+                .ToUserDefinedType("applicant_addr", CV_KEYSPACE)
                 .HasNoKey();
         }
     }
diff --git a/src/EFCore.Cassandra/CassandraDbContextOptionsExtensions.cs b/src/EFCore.Cassandra/CassandraDbContextOptionsExtensions.cs
@@ -9,14 +9,19 @@ namespace Microsoft.EntityFrameworkCore
 {
     public static class CassandraDbContextOptionsExtensions
     {
-        public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder  optionsBuilder, string connectionString, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null)
+        public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder  optionsBuilder, string connectionString, string defaultKeyspace, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null)
         {
-            return UseCassandra(optionsBuilder, connectionString, cassandraOptionsAction, null);
+            return UseCassandra(optionsBuilder, connectionString, defaultKeyspace, cassandraOptionsAction, null);
         }
 
-        public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null, Action<Builder> clusterBuilderCallback = null)
+        public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, string defaultKeyspace, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null, Action<Builder> clusterBuilderCallback = null)
         {
             var extension = (CassandraOptionsExtension)GetOrCreateExtension(optionsBuilder).WithConnectionString(connectionString);
+            if (!string.IsNullOrWhiteSpace(defaultKeyspace))
+            {
+                extension = extension.WithDefaultKeyspace(defaultKeyspace);
+            }
+
             if (clusterBuilderCallback != null)
             {
                 extension = extension.WithCallbackClusterBuilder(clusterBuilderCallback);
diff --git a/src/EFCore.Cassandra/Infrastructure/Internal/CassandraOptionsExtension.cs b/src/EFCore.Cassandra/Infrastructure/Internal/CassandraOptionsExtension.cs
@@ -13,6 +13,7 @@ namespace Microsoft.EntityFrameworkCore.Cassandra.Infrastructure.Internal
     public class CassandraOptionsExtension : RelationalOptionsExtension
     {
         private Action<Builder> _callback;
+        private string _defaultKeyspace;
 
         public CassandraOptionsExtension() { }
 
@@ -21,6 +22,7 @@ protected CassandraOptionsExtension(CassandraOptionsExtension copyFrom) : base(c
         public override DbContextOptionsExtensionInfo Info => new ExtensionInfo(this);
 
         public virtual Action<Builder> ClusterBuilder => _callback;
+        public virtual string DefaultKeyspace => _defaultKeyspace;
 
         public override void ApplyServices(IServiceCollection services)
         {
@@ -34,10 +36,18 @@ public CassandraOptionsExtension WithCallbackClusterBuilder(Action<Builder> call
             return clone;
         }
 
+        public CassandraOptionsExtension WithDefaultKeyspace(string keyspace)
+        {
+            var clone = (CassandraOptionsExtension)Clone();
+            clone._defaultKeyspace = keyspace;
+            return clone;
+        }
+
 
         protected override RelationalOptionsExtension Clone() => new CassandraOptionsExtension(this)
         {
-            _callback = _callback
+            _callback = _callback,
+            _defaultKeyspace = _defaultKeyspace
         };
 
         public new static CassandraOptionsExtension Extract(IDbContextOptions options)
diff --git a/src/EFCore.Cassandra/Migrations/CassandraHistoryRepository.cs b/src/EFCore.Cassandra/Migrations/CassandraHistoryRepository.cs
@@ -4,14 +4,10 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.EntityFrameworkCore.Storage;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
diff --git a/src/EFCore.Cassandra/Storage/Internal/CassandraDatabaseCreator.cs b/src/EFCore.Cassandra/Storage/Internal/CassandraDatabaseCreator.cs
@@ -1,5 +1,6 @@
 ﻿// Copyright (c) SimpleIdServer. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+using Microsoft.EntityFrameworkCore.Cassandra.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using System;
 
@@ -9,11 +10,13 @@ public class CassandraDatabaseCreator : RelationalDatabaseCreator
     {
         private readonly IRelationalConnection _relationalConnection;
         private readonly IRawSqlCommandBuilder _rawSqlCommandBuilder;
+        private readonly RelationalConnectionDependencies _relationalConnectionDependencies;
 
-        public CassandraDatabaseCreator(IRelationalConnection relationalConnection, IRawSqlCommandBuilder rawCommandBuilder, RelationalDatabaseCreatorDependencies dependencies) : base(dependencies)
+        public CassandraDatabaseCreator(IRelationalConnection relationalConnection, IRawSqlCommandBuilder rawCommandBuilder, RelationalConnectionDependencies relationalConnectionDependencies, RelationalDatabaseCreatorDependencies dependencies) : base(dependencies)
         {
             _relationalConnection = relationalConnection;
             _rawSqlCommandBuilder = rawCommandBuilder;
+            _relationalConnectionDependencies = relationalConnectionDependencies;
         }
 
         public override void Create() { }
@@ -38,9 +41,9 @@ public override bool Exists()
 
         public override bool HasTables()
         {
-            var database = Dependencies.Connection.DbConnection.Database;
-            var sql = $"SELECT count(*) FROM system_schema.tables WHERE keyspace_name='{database}'";
-            return Dependencies.ExecutionStrategyFactory.Create().Execute(_relationalConnection, connection => (int)_rawSqlCommandBuilder.Build(sql).ExecuteScalar(
+            var optionsExtensions = CassandraOptionsExtension.Extract(_relationalConnectionDependencies.ContextOptions);
+            var sql = $"SELECT count(*) FROM system_schema.tables WHERE keyspace_name='{optionsExtensions.DefaultKeyspace}'";
+            return Dependencies.ExecutionStrategyFactory.Create().Execute(_relationalConnection, connection => (long)_rawSqlCommandBuilder.Build(sql).ExecuteScalar(
                 new RelationalCommandParameterObject(connection, null, null, null, null)
                 ) > 0);
         }
diff --git a/tests/EFCore.Cassandra.Tests/FakeDbContext.cs b/tests/EFCore.Cassandra.Tests/FakeDbContext.cs
@@ -23,7 +23,7 @@ public FakeDbContext(Action<ModelBuilder> modelCreatingCallback)
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseCassandra("connectionstring", _cassandraOptionsAction);
+            optionsBuilder.UseCassandra("connectionstring", "cv", _cassandraOptionsAction);
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,14 @@ namespace EFCore.Cassandra.Samples`
`10`	`10`	`{`
`11`	`11`	`public class FakeDbContext : DbContext`
`12`	`12`	`{`
	`13`	`+ private const string CV_KEYSPACE = "cv";`
`13`	`14`	`public DbSet<Applicant> Applicants { get; set; }`
`14`	`15`
`15`	`16`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`16`	`17`	`{`
`17`		`- optionsBuilder.UseCassandra("Contact Points=127.0.0.1;", opt =>`
	`18`	`+ optionsBuilder.UseCassandra($"Contact Points=127.0.0.1", CV_KEYSPACE, opt =>`
`18`	`19`	`{`
`19`		`- opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "cv");`
	`20`	`+ opt.MigrationsHistoryTable(HistoryRepository.DefaultTableName, CV_KEYSPACE);`
`20`	`21`	`}, b =>`
`21`	`22`	`{`
`22`	`23`	`b.WithQueryOptions(new QueryOptions().SetConsistencyLevel(ConsistencyLevel.LocalOne))`
`@@ -38,9 +39,9 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`38`	`39`	`protected override void OnModelCreating(ModelBuilder modelBuilder)`
`39`	`40`	`{`
`40`	`41`	`var timeUuidConverter = new TimeUuidToGuidConverter();`
`41`		`- modelBuilder.ForCassandraAddKeyspace("cv", new KeyspaceReplicationSimpleStrategyClass(2));`
	`42`	`+ modelBuilder.ForCassandraAddKeyspace(CV_KEYSPACE, new KeyspaceReplicationSimpleStrategyClass(2));`
`42`	`43`	`modelBuilder.Entity<Applicant>()`
`43`		`- .ToTable("applicants", "cv")`
	`44`	`+ .ToTable("applicants", CV_KEYSPACE)`
`44`	`45`	`.HasKey(p => new { p.Id, p.Order });`
`45`	`46`	`modelBuilder.Entity<Applicant>()`
`46`	`47`	`.ForCassandraSetClusterColumns(_ => _.Order)`
`@@ -52,10 +53,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)`
`52`	`53`	`.Property(p => p.Id)`
`53`	`54`	`.HasColumnName("id");`
`54`	`55`	`modelBuilder.Entity<CV>()`
`55`		`- .ToTable("cvs", "cv")`
	`56`	`+ .ToTable("cvs", CV_KEYSPACE)`
`56`	`57`	`.HasKey(c => c.Id);`
`57`	`58`	`modelBuilder.Entity<ApplicantAddress>()`
`58`		`- .ToUserDefinedType("applicant_addr", "cv")`
	`59`	`+ .ToUserDefinedType("applicant_addr", CV_KEYSPACE)`
`59`	`60`	`.HasNoKey();`
`60`	`61`	`}`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,19 @@ namespace Microsoft.EntityFrameworkCore`
`9`	`9`	`{`
`10`	`10`	`public static class CassandraDbContextOptionsExtensions`
`11`	`11`	`{`
`12`		`- public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null)`
	`12`	`+ public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, string defaultKeyspace, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null)`
`13`	`13`	`{`
`14`		`- return UseCassandra(optionsBuilder, connectionString, cassandraOptionsAction, null);`
	`14`	`+ return UseCassandra(optionsBuilder, connectionString, defaultKeyspace, cassandraOptionsAction, null);`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null, Action<Builder> clusterBuilderCallback = null)`
	`17`	`+ public static DbContextOptionsBuilder UseCassandra(this DbContextOptionsBuilder optionsBuilder, string connectionString, string defaultKeyspace, Action<CassandraDbContextOptionsBuilder> cassandraOptionsAction = null, Action<Builder> clusterBuilderCallback = null)`
`18`	`18`	`{`
`19`	`19`	`var extension = (CassandraOptionsExtension)GetOrCreateExtension(optionsBuilder).WithConnectionString(connectionString);`
	`20`	`+ if (!string.IsNullOrWhiteSpace(defaultKeyspace))`
	`21`	`+ {`
	`22`	`+ extension = extension.WithDefaultKeyspace(defaultKeyspace);`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`if (clusterBuilderCallback != null)`
`21`	`26`	`{`
`22`	`27`	`extension = extension.WithCallbackClusterBuilder(clusterBuilderCallback);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// Copyright (c) SimpleIdServer. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.`
	`3`	`+using Microsoft.EntityFrameworkCore.Cassandra.Infrastructure.Internal;`
`3`	`4`	`using Microsoft.EntityFrameworkCore.Storage;`
`4`	`5`	`using System;`
`5`	`6`
`@@ -9,11 +10,13 @@ public class CassandraDatabaseCreator : RelationalDatabaseCreator`
`9`	`10`	`{`
`10`	`11`	`private readonly IRelationalConnection _relationalConnection;`
`11`	`12`	`private readonly IRawSqlCommandBuilder _rawSqlCommandBuilder;`
	`13`	`+ private readonly RelationalConnectionDependencies _relationalConnectionDependencies;`
`12`	`14`
`13`		`- public CassandraDatabaseCreator(IRelationalConnection relationalConnection, IRawSqlCommandBuilder rawCommandBuilder, RelationalDatabaseCreatorDependencies dependencies) : base(dependencies)`
	`15`	`+ public CassandraDatabaseCreator(IRelationalConnection relationalConnection, IRawSqlCommandBuilder rawCommandBuilder, RelationalConnectionDependencies relationalConnectionDependencies, RelationalDatabaseCreatorDependencies dependencies) : base(dependencies)`
`14`	`16`	`{`
`15`	`17`	`_relationalConnection = relationalConnection;`
`16`	`18`	`_rawSqlCommandBuilder = rawCommandBuilder;`
	`19`	`+ _relationalConnectionDependencies = relationalConnectionDependencies;`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`public override void Create() { }`
`@@ -38,9 +41,9 @@ public override bool Exists()`
`38`	`41`
`39`	`42`	`public override bool HasTables()`
`40`	`43`	`{`
`41`		`- var database = Dependencies.Connection.DbConnection.Database;`
`42`		`- var sql = $"SELECT count(*) FROM system_schema.tables WHERE keyspace_name='{database}'";`
`43`		`- return Dependencies.ExecutionStrategyFactory.Create().Execute(_relationalConnection, connection => (int)_rawSqlCommandBuilder.Build(sql).ExecuteScalar(`
	`44`	`+ var optionsExtensions = CassandraOptionsExtension.Extract(_relationalConnectionDependencies.ContextOptions);`
	`45`	`+ var sql = $"SELECT count(*) FROM system_schema.tables WHERE keyspace_name='{optionsExtensions.DefaultKeyspace}'";`
	`46`	`+ return Dependencies.ExecutionStrategyFactory.Create().Execute(_relationalConnection, connection => (long)_rawSqlCommandBuilder.Build(sql).ExecuteScalar(`
`44`	`47`	`new RelationalCommandParameterObject(connection, null, null, null, null)`
`45`	`48`	`) > 0);`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public FakeDbContext(Action<ModelBuilder> modelCreatingCallback)`
`23`	`23`
`24`	`24`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`25`	`25`	`{`
`26`		`- optionsBuilder.UseCassandra("connectionstring", _cassandraOptionsAction);`
	`26`	`+ optionsBuilder.UseCassandra("connectionstring", "cv", _cassandraOptionsAction);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`protected override void OnModelCreating(ModelBuilder modelBuilder)`