From 262435a37d82013e429f3659652a8ee0f688b3e2 Mon Sep 17 00:00:00 2001 From: Mike Dirolf Date: Tue, 20 Jan 2009 16:17:38 -0500 Subject: [PATCH] no constant for this --- collection.py | 3 +-- database.py | 1 + test/test_database.py | 14 +++++++------- test/test_mongo.py | 13 ++++++------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/collection.py b/collection.py index 785249f1a..25d103d22 100644 --- a/collection.py +++ b/collection.py @@ -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. diff --git a/database.py b/database.py index eea582e8b..d93e07428 100644 --- a/database.py +++ b/database.py @@ -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 diff --git a/test/test_database.py b/test/test_database.py index 2646c2caa..84861130d 100644 --- a/test/test_database.py +++ b/test/test_database.py @@ -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), diff --git a/test/test_mongo.py b/test/test_mongo.py index cba3504f7..cea966d3b 100644 --- a/test/test_mongo.py +++ b/test/test_mongo.py @@ -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),