no constant for this

This commit is contained in:
Mike Dirolf 2009-01-20 16:17:38 -05:00
parent ec52fd8b2a
commit 262435a37d
4 changed files with 15 additions and 16 deletions

View File

@ -10,7 +10,6 @@ from errors import InvalidName, OperationFailure
_ZERO = "\x00\x00\x00\x00"
_ONE = "\x01\x00\x00\x00"
SYSTEM_INDEX_COLLECTION = "system.indexes"
class Collection(object):
"""A Mongo collection.
@ -243,7 +242,7 @@ class Collection(object):
key_object[key] = value
to_save["key"] = key_object
self.__database[SYSTEM_INDEX_COLLECTION].save(to_save, False)
self.__database.system.indexes.save(to_save, False)
def drop_indexes(self):
"""Drops all indexes on this collection.

View File

@ -6,6 +6,7 @@ from son_manipulator import ObjectIdInjector
from collection import Collection
from errors import InvalidName, CollectionInvalid, OperationFailure
# sort directions
ASCENDING = 1
DESCENDING = -1

View File

@ -10,7 +10,7 @@ from son import SON
from objectid import ObjectId
from database import Database, ASCENDING, DESCENDING, OFF, SLOW_ONLY, ALL
from connection import Connection
from collection import Collection, SYSTEM_INDEX_COLLECTION
from collection import Collection
from test_connection import get_connection
class TestDatabase(unittest.TestCase):
@ -211,28 +211,28 @@ class TestDatabase(unittest.TestCase):
self.assertRaises(TypeError, db.test.create_index, "hello", "world")
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index("hello", ASCENDING)
db.test.create_index([("hello", DESCENDING), ("world", ASCENDING)])
count = 0
for _ in db[SYSTEM_INDEX_COLLECTION].find({"ns": u"test.test"}):
for _ in db.system.indexes.find({"ns": u"test.test"}):
count += 1
self.assertEqual(count, 2)
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index("hello", ASCENDING)
self.assertEqual(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}),
self.assertEqual(db.system.indexes.find_one({"ns": u"test.test"}),
SON([(u"name", u"hello_1"),
(u"ns", u"test.test"),
(u"key", SON([(u"hello", 1)]))]))
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index([("hello", DESCENDING), ("world", ASCENDING)])
self.assertEqual(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}),
self.assertEqual(db.system.indexes.find_one({"ns": u"test.test"}),
SON([(u"name", u"hello_-1_world_1"),
(u"ns", u"test.test"),
(u"key", SON([(u"hello", -1),

View File

@ -9,7 +9,6 @@ from objectid import ObjectId
from dbref import DBRef
from son import SON
from errors import InvalidOperation, ConnectionFailure
from collection import SYSTEM_INDEX_COLLECTION
from mongo import Mongo, ASCENDING, DESCENDING
class TestMongo(unittest.TestCase):
@ -139,28 +138,28 @@ class TestMongo(unittest.TestCase):
self.assertRaises(TypeError, db.test.create_index, "hello", "world")
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index("hello", ASCENDING)
db.test.create_index([("hello", DESCENDING), ("world", ASCENDING)])
count = 0
for _ in db[SYSTEM_INDEX_COLLECTION].find({"ns": u"test.test"}):
for _ in db.system.indexes.find({"ns": u"test.test"}):
count += 1
self.assertEqual(count, 2)
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index("hello", ASCENDING)
self.assertEqual(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}),
self.assertEqual(db.system.indexes.find_one({"ns": u"test.test"}),
SON([(u"name", u"hello_1"),
(u"ns", u"test.test"),
(u"key", SON([(u"hello", 1)]))]))
db.test.drop_indexes()
self.assertFalse(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}))
self.assertFalse(db.system.indexes.find_one({"ns": u"test.test"}))
db.test.create_index([("hello", DESCENDING), ("world", ASCENDING)])
self.assertEqual(db[SYSTEM_INDEX_COLLECTION].find_one({"ns": u"test.test"}),
self.assertEqual(db.system.indexes.find_one({"ns": u"test.test"}),
SON([(u"name", u"hello_-1_world_1"),
(u"ns", u"test.test"),
(u"key", SON([(u"hello", -1),