Author: jbellis Date: Fri Apr 1 15:04:52 2011 New Revision: 1087735 URL: http://svn.apache.org/viewvc?rev=1087735&view=rev Log: modernize column name quoting
Modified: cassandra/trunk/test/system/test_cql.py Modified: cassandra/trunk/test/system/test_cql.py URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1087735&r1=1087734&r2=1087735&view=diff ============================================================================== --- cassandra/trunk/test/system/test_cql.py (original) +++ cassandra/trunk/test/system/test_cql.py Fri Apr 1 15:04:52 2011 @@ -68,10 +68,10 @@ def load_sample(dbconn): WITH comparator = ascii AND default_validation = timeuuid; """) dbconn.execute(""" - CREATE COLUMNFAMILY IndexedA (KEY utf8 PRIMARY KEY, 'birthdate' long) + CREATE COLUMNFAMILY IndexedA (KEY utf8 PRIMARY KEY, birthdate long) WITH comparator = ascii AND default_validation = ascii; """) - dbconn.execute("CREATE INDEX ON IndexedA ('birthdate');") + dbconn.execute("CREATE INDEX ON IndexedA (birthdate)") query = "UPDATE StandardString1 SET ? = ?, ? = ? WHERE KEY = ?" dbconn.execute(query, "ca1", "va1", "col", "val", "ka") @@ -441,8 +441,8 @@ class TestCql(ThriftTester): conn = init() conn.execute("USE Keyspace1") conn.execute("CREATE COLUMNFAMILY CreateIndex1 (KEY utf8 PRIMARY KEY)") - conn.execute("CREATE INDEX namedIndex ON CreateIndex1 ('items')") - conn.execute("CREATE INDEX ON CreateIndex1 ('stuff')") + conn.execute("CREATE INDEX namedIndex ON CreateIndex1 (items)") + conn.execute("CREATE INDEX ON CreateIndex1 (stuff)") # TODO: temporary (until this can be done with CQL). ksdef = thrift_client.describe_keyspace("Keyspace1") @@ -455,9 +455,10 @@ class TestCql(ThriftTester): "index_name should be unset, not %s" % stuff.index_name assert stuff.index_type == 0, "missing index" + # already indexed assert_raises(CQLException, conn.execute, - "CREATE INDEX ON CreateIndex1 (\"stuff\")") + "CREATE INDEX ON CreateIndex1 (stuff)") def test_time_uuid(self): "store and retrieve time-based (type 1) uuids"