From 4fa9572fc5b95fefad4ebff844db9e518fd733b2 Mon Sep 17 00:00:00 2001 From: Nick Berardi Date: Fri, 25 Jan 2013 08:38:49 -0500 Subject: [PATCH] The ConnectionDefault setting was confusing for CqlVersion so now ull is just being used instead to imply ConnectionDefault --- src/CassandraContext.cs | 6 +++--- src/Connections/ConnectionBuilder.cs | 4 ++-- src/Connections/CqlVersion.cs | 1 - src/Operations/ExecuteCqlNonQuery.cs | 2 +- src/Operations/ExecuteCqlQuery.cs | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/CassandraContext.cs b/src/CassandraContext.cs index 3c14cbc..ba89d3d 100644 --- a/src/CassandraContext.cs +++ b/src/CassandraContext.cs @@ -323,7 +323,7 @@ public void SaveChanges(IFluentRecord record, bool atomic = true) /// /// /// - public IEnumerable ExecuteQuery(UTF8Type cqlQuery, string cqlVersion = CqlVersion.ConnectionDefault) + public IEnumerable ExecuteQuery(UTF8Type cqlQuery, string cqlVersion = null) { var op = new ExecuteCqlQuery(cqlQuery, cqlVersion); return ExecuteOperation(op); @@ -333,7 +333,7 @@ public IEnumerable ExecuteQuery(UTF8Type cqlQuery, string cqlVersion = /// /// /// - public void TryExecuteNonQuery(UTF8Type cqlQuery, string cqlVersion = CqlVersion.ConnectionDefault) + public void TryExecuteNonQuery(UTF8Type cqlQuery, string cqlVersion = null) { try { ExecuteNonQuery(cqlQuery, cqlVersion); @@ -346,7 +346,7 @@ public void TryExecuteNonQuery(UTF8Type cqlQuery, string cqlVersion = CqlVersion /// /// /// - public void ExecuteNonQuery(UTF8Type cqlQuery, string cqlVersion = CqlVersion.ConnectionDefault) + public void ExecuteNonQuery(UTF8Type cqlQuery, string cqlVersion = null) { var op = new ExecuteCqlNonQuery(cqlQuery, cqlVersion); ExecuteOperation(op); diff --git a/src/Connections/ConnectionBuilder.cs b/src/Connections/ConnectionBuilder.cs index 09f992c..65c245e 100644 --- a/src/Connections/ConnectionBuilder.cs +++ b/src/Connections/ConnectionBuilder.cs @@ -14,7 +14,7 @@ public class ConnectionBuilder : FluentCassandra.Connections.IConnectionBuilder /// /// /// - public ConnectionBuilder(string keyspace, string host, int port = Server.DefaultPort, int connectionTimeout = Server.DefaultTimeout, bool pooling = false, int minPoolSize = 0, int maxPoolSize = 100, int maxRetries = 0, int serverPollingInterval = 30, int connectionLifetime = 0, ConnectionType connectionType = ConnectionType.Framed, int bufferSize = 1024, ConsistencyLevel read = ConsistencyLevel.QUORUM, ConsistencyLevel write = ConsistencyLevel.QUORUM, string cqlVersion = FluentCassandra.Connections.CqlVersion.ConnectionDefault , bool compressCqlQueries = true, string username = null, string password = null) + public ConnectionBuilder(string keyspace, string host, int port = Server.DefaultPort, int connectionTimeout = Server.DefaultTimeout, bool pooling = false, int minPoolSize = 0, int maxPoolSize = 100, int maxRetries = 0, int serverPollingInterval = 30, int connectionLifetime = 0, ConnectionType connectionType = ConnectionType.Framed, int bufferSize = 1024, ConsistencyLevel read = ConsistencyLevel.QUORUM, ConsistencyLevel write = ConsistencyLevel.QUORUM, string cqlVersion = FluentCassandra.Connections.CqlVersion.Edge , bool compressCqlQueries = true, string username = null, string password = null) { Keyspace = keyspace; Servers = new List() { new Server(host, port) }; @@ -37,7 +37,7 @@ public ConnectionBuilder(string keyspace, string host, int port = Server.Default ConnectionString = GetConnectionString(); } - public ConnectionBuilder(string keyspace, Server server, bool pooling = false, int minPoolSize = 0, int maxPoolSize = 100, int maxRetries = 0, int serverPollingInterval = 30, int connectionLifetime = 0, ConnectionType connectionType = ConnectionType.Framed, int bufferSize = 1024, ConsistencyLevel read = ConsistencyLevel.QUORUM, ConsistencyLevel write = ConsistencyLevel.QUORUM, string cqlVersion = FluentCassandra.Connections.CqlVersion.ConnectionDefault, bool compressCqlQueries = true, string username = null, string password = null) + public ConnectionBuilder(string keyspace, Server server, bool pooling = false, int minPoolSize = 0, int maxPoolSize = 100, int maxRetries = 0, int serverPollingInterval = 30, int connectionLifetime = 0, ConnectionType connectionType = ConnectionType.Framed, int bufferSize = 1024, ConsistencyLevel read = ConsistencyLevel.QUORUM, ConsistencyLevel write = ConsistencyLevel.QUORUM, string cqlVersion = FluentCassandra.Connections.CqlVersion.Edge, bool compressCqlQueries = true, string username = null, string password = null) { Keyspace = keyspace; Servers = new List() { server }; diff --git a/src/Connections/CqlVersion.cs b/src/Connections/CqlVersion.cs index 9de7223..5090407 100644 --- a/src/Connections/CqlVersion.cs +++ b/src/Connections/CqlVersion.cs @@ -8,7 +8,6 @@ public static class CqlVersion public const string Cql = "2.0.0"; public const string Cql3 = "3.0.0"; public const string Edge = Cql3; - public const string ConnectionDefault = null; [Obsolete("This is no longer supported, please use ConnectionDefault", error: true)] public const string ServerDefault = null; diff --git a/src/Operations/ExecuteCqlNonQuery.cs b/src/Operations/ExecuteCqlNonQuery.cs index 89253a2..26bdbf7 100644 --- a/src/Operations/ExecuteCqlNonQuery.cs +++ b/src/Operations/ExecuteCqlNonQuery.cs @@ -20,7 +20,7 @@ public override Void Execute() if (isCqlQueryCompressed) query = Helper.ZlibCompress(query); - if (CqlVersion == FluentCassandra.Connections.CqlVersion.ConnectionDefault) + if (CqlVersion == null) CqlVersion = Session.ConnectionBuilder.CqlVersion; var client = Session.GetClient(); diff --git a/src/Operations/ExecuteCqlQuery.cs b/src/Operations/ExecuteCqlQuery.cs index 9ff2004..e06c19f 100644 --- a/src/Operations/ExecuteCqlQuery.cs +++ b/src/Operations/ExecuteCqlQuery.cs @@ -40,7 +40,7 @@ public override IEnumerable Execute() if (isCqlQueryCompressed) query = Helper.ZlibCompress(query); - if (CqlVersion == FluentCassandra.Connections.CqlVersion.ConnectionDefault) + if (CqlVersion == null) CqlVersion = Session.ConnectionBuilder.CqlVersion; var client = Session.GetClient();