You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2011/03/24 00:23:24 UTC
svn commit: r1084802 - in /cassandra/trunk: drivers/py/cql/connection.py test/system/test_cql.py

Author: eevans
Date: Wed Mar 23 23:23:23 2011
New Revision: 1084802

URL: http://svn.apache.org/viewvc?rev=1084802&view=rev
Log:
leading whitespace optional (sigh)

Patch by eevans

Modified:
    cassandra/trunk/drivers/py/cql/connection.py
    cassandra/trunk/test/system/test_cql.py

Modified: cassandra/trunk/drivers/py/cql/connection.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/connection.py?rev=1084802&r1=1084801&r2=1084802&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/connection.py (original)
+++ cassandra/trunk/drivers/py/cql/connection.py Wed Mar 23 23:23:23 2011
@@ -47,8 +47,8 @@ class Connection(object):
     ...         print "%s is %s years of age" % (r.key, column.age)
     """
     _keyspace_re = re.compile("USE (\w+);?", re.I | re.M)
-    _cfamily_re = re.compile("\s+SELECT\s+.+\s+FROM\s+(\w+)", re.I | re.M)
-    _ddl_re = re.compile("\s+(CREATE|ALTER|DROP)\s+", re.I | re.M)
+    _cfamily_re = re.compile("\s*SELECT\s+.+\s+FROM\s+[\']?(\w+)", re.I | re.M)
+    _ddl_re = re.compile("\s*(CREATE|ALTER|DROP)\s+", re.I | re.M)
     
     def __init__(self, host, port=9160, keyspace=None, username=None,
                  password=None, decoder=None):

Modified: cassandra/trunk/test/system/test_cql.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1084802&r1=1084801&r2=1084802&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_cql.py (original)
+++ cassandra/trunk/test/system/test_cql.py Wed Mar 23 23:23:23 2011
@@ -528,7 +528,7 @@ class TestCql(ThriftTester):
         
         r = conn.execute("SELECT ? FROM StandardUUID WHERE KEY = 'uuidtest'",
                          uid)
-        assert r[0].columns[0].name == uid.bytes
+        assert r[0].columns[0].name == uid
         
         # TODO: slices of uuids from cf w/ LexicalUUIDType comparator
         
@@ -542,16 +542,16 @@ class TestCql(ThriftTester):
         conn.execute("UPDATE StandardUtf82 SET ? = v1 WHERE KEY = k1", "Â¢")
         
         r = conn.execute("SELECT * FROM StandardUtf82 WHERE KEY = k1")
-        assert r[0][0].name == "Â¢"
-        assert r[0][1].name == "Â©"
-        assert r[0][2].name == "Â®"
-        assert r[0][3].name == "Â¿"
+        assert r[0][0].name == u"Â¢"
+        assert r[0][1].name == u"Â©"
+        assert r[0][2].name == u"Â®"
+        assert r[0][3].name == u"Â¿"
         
         r = conn.execute("SELECT ?..'' FROM StandardUtf82 WHERE KEY = k1", "Â©")
         assert len(r[0]) == 3
-        assert r[0][0].name == "Â©"
-        assert r[0][1].name == "Â®"
-        assert r[0][2].name == "Â¿"
+        assert r[0][0].name == u"Â©"
+        assert r[0][1].name == u"Â®"
+        assert r[0][2].name == u"Â¿"