launchpad-reviewers team mailing list archive

[Colin Watson <mp+447560@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:sqlbase-comments into launchpad:master.

Commit message:
Update some old comments that mention SQLBase

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/447560

I'm using `git grep SQLBase` as my to-do list for SQLObject-to-Storm conversions at the moment, and it would be nice to clean up a bit of noise.  This commit introduces no functional change.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:sqlbase-comments into launchpad:master.

diff --git a/lib/lp/answers/model/questionmessage.py b/lib/lp/answers/model/questionmessage.py
index 2f5dd6c..01ad7f5 100644
--- a/lib/lp/answers/model/questionmessage.py
+++ b/lib/lp/answers/model/questionmessage.py
@@ -1,7 +1,7 @@
 # Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""SQLBase implementation of IQuestionMessage."""
+"""Storm implementation of IQuestionMessage."""
 
 __all__ = [
     "QuestionMessage",
diff --git a/lib/lp/answers/model/questionreopening.py b/lib/lp/answers/model/questionreopening.py
index 7b850a2..1b23906 100644
--- a/lib/lp/answers/model/questionreopening.py
+++ b/lib/lp/answers/model/questionreopening.py
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""SQLBase implementation of IQuestionReopening."""
+"""Storm implementation of IQuestionReopening."""
 
 __all__ = ["QuestionReopening", "create_questionreopening"]
 
diff --git a/lib/lp/app/interfaces/launchpad.py b/lib/lp/app/interfaces/launchpad.py
index 767f45a..ca8f2d6 100644
--- a/lib/lp/app/interfaces/launchpad.py
+++ b/lib/lp/app/interfaces/launchpad.py
@@ -28,7 +28,7 @@ from lp.app.enums import ServiceUsage
 class ILaunchpadCelebrities(Interface):
     """Well known things.
 
-    Celebrities are SQLBase instances that have a well known name.
+    Celebrities are database objects that have a well-known name.
     """
 
     admin = Attribute("The 'admins' team.")
diff --git a/lib/lp/services/database/stormbase.py b/lib/lp/services/database/stormbase.py
index 65a1933..9dfa6e1 100644
--- a/lib/lp/services/database/stormbase.py
+++ b/lib/lp/services/database/stormbase.py
@@ -72,8 +72,8 @@ class StormBase(Storm):  # noqa: B1
         primary = [var.get() for var in obj_info["primary_vars"]]
         return hash((self.__class__,) + tuple(primary))
 
-    # XXX: jcsackett 2011-01-20 bug=622648: Much as with the SQLBase,
-    # this is not tested.
+    # XXX: jcsackett 2011-01-20 bug=622648: This is not directly tested, but
+    # large chunks of the test suite blow up if it's broken.
     def __storm_invalidated__(self):
         """Flush cached properties."""
         clear_property_cache(self)
diff --git a/lib/lp/testing/layers.py b/lib/lp/testing/layers.py
index df1c60c..ce68de6 100644
--- a/lib/lp/testing/layers.py
+++ b/lib/lp/testing/layers.py
@@ -172,8 +172,8 @@ def reconnect_stores(reset=False):
     main_store = IStore(LibraryFileAlias)
     assert main_store is not None, "Failed to reconnect"
 
-    # Confirm that SQLOS is again talking to the database (it connects
-    # as soon as SQLBase._connection is accessed
+    # Confirm that Storm is talking to the database again (it connects
+    # as soon as any query is executed).
     r = main_store.execute("SELECT count(*) FROM LaunchpadDatabaseRevision")
     assert r.get_one()[0] > 0, "Storm is not talking to the database"
     assert session_store() is not None, "Failed to reconnect"