You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/07/08 22:09:17 UTC
git commit: cqlsh: support the new TimestampType
Updated Branches:
refs/heads/trunk 2de07250d -> 61772d3d7
cqlsh: support the new TimestampType
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5729
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61772d3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61772d3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61772d3d
Branch: refs/heads/trunk
Commit: 61772d3d7b333071268675653ded650b59c36496
Parents: 2de0725
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Jul 8 23:08:19 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Jul 8 23:08:19 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 +-
pylib/cqlshlib/cql3handling.py | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61772d3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b7dcc5..88683c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -72,7 +72,7 @@
* Move resultset type information into prepare, not execute (CASSANDRA-5649)
* Auto paging in binary protocol (CASSANDRA-4415, 5714)
* Don't tie client side use of AbstractType to JDBC (CASSANDRA-4495)
- * Adds new TimestampType to replace DateType (CASSANDRA-5723)
+ * Adds new TimestampType to replace DateType (CASSANDRA-5723, CASSANDRA-5729)
1.2.7
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61772d3d/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 110fd6a..40d22c6 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -18,7 +18,7 @@ import re
from warnings import warn
from .cqlhandling import CqlParsingRuleSet, Hint
from cql.cqltypes import (cql_types, lookup_casstype, CompositeType, UTF8Type,
- ColumnToCollectionType, CounterColumnType)
+ ColumnToCollectionType, CounterColumnType, DateType)
from . import helptopics
simple_cql_types = set(cql_types)
@@ -31,6 +31,10 @@ try:
except ImportError:
import simplejson as json
+# temporarily have this here until a newer cassandra-dbapi2 is bundled with C*
+class TimestampType(DateType):
+ pass
+
class UnexpectedTableStructure(UserWarning):
def __init__(self, msg):
self.msg = msg