From 5f5954c1923058031b07dda2e0898164a3554318 Mon Sep 17 00:00:00 2001
From: Camill Kaipf <ckaipf@posteo.de>
Date: Fri, 12 Aug 2022 13:39:47 +0200
Subject: update SQLAlchemy logger in quick tutorial fixes #3706

---
 docs/quick_tutorial/databases.rst             | 26 +++++++++++++-------------
 docs/quick_tutorial/databases/development.ini |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'docs')

diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index db75d70ce..7e85e4b95 100644
--- a/docs/quick_tutorial/databases.rst
+++ b/docs/quick_tutorial/databases.rst
@@ -87,13 +87,13 @@ Steps
 
         $VENV/bin/initialize_tutorial_db development.ini
 
-        2016-04-16 13:01:33,055 INFO  [sqlalchemy.engine.base.Engine][MainThread] SELECT CAST('test plain returns' AS VARCHAR(60)) AS anon_1
-        2016-04-16 13:01:33,055 INFO  [sqlalchemy.engine.base.Engine][MainThread] ()
-        2016-04-16 13:01:33,056 INFO  [sqlalchemy.engine.base.Engine][MainThread] SELECT CAST('test unicode returns' AS VARCHAR(60)) AS anon_1
-        2016-04-16 13:01:33,056 INFO  [sqlalchemy.engine.base.Engine][MainThread] ()
-        2016-04-16 13:01:33,057 INFO  [sqlalchemy.engine.base.Engine][MainThread] PRAGMA table_info("wikipages")
-        2016-04-16 13:01:33,057 INFO  [sqlalchemy.engine.base.Engine][MainThread] ()
-        2016-04-16 13:01:33,058 INFO  [sqlalchemy.engine.base.Engine][MainThread]
+        2016-04-16 13:01:33,055 INFO  [sqlalchemy.engine.Engine][MainThread] SELECT CAST('test plain returns' AS VARCHAR(60)) AS anon_1
+        2016-04-16 13:01:33,055 INFO  [sqlalchemy.engine.Engine][MainThread] ()
+        2016-04-16 13:01:33,056 INFO  [sqlalchemy.engine.Engine][MainThread] SELECT CAST('test unicode returns' AS VARCHAR(60)) AS anon_1
+        2016-04-16 13:01:33,056 INFO  [sqlalchemy.engine.Engine][MainThread] ()
+        2016-04-16 13:01:33,057 INFO  [sqlalchemy.engine.Engine][MainThread] PRAGMA table_info("wikipages")
+        2016-04-16 13:01:33,057 INFO  [sqlalchemy.engine.Engine][MainThread] ()
+        2016-04-16 13:01:33,058 INFO  [sqlalchemy.engine.Engine][MainThread]
         CREATE TABLE wikipages (
                uid INTEGER NOT NULL,
                title TEXT,
@@ -103,12 +103,12 @@ Steps
         )
 
 
-        2016-04-16 13:01:33,058 INFO  [sqlalchemy.engine.base.Engine][MainThread] ()
-        2016-04-16 13:01:33,059 INFO  [sqlalchemy.engine.base.Engine][MainThread] COMMIT
-        2016-04-16 13:01:33,062 INFO  [sqlalchemy.engine.base.Engine][MainThread] BEGIN (implicit)
-        2016-04-16 13:01:33,062 INFO  [sqlalchemy.engine.base.Engine][MainThread] INSERT INTO wikipages (title, body) VALUES (?, ?)
-        2016-04-16 13:01:33,063 INFO  [sqlalchemy.engine.base.Engine][MainThread] ('Root', '<p>Root</p>')
-        2016-04-16 13:01:33,063 INFO  [sqlalchemy.engine.base.Engine][MainThread] COMMIT
+        2016-04-16 13:01:33,058 INFO  [sqlalchemy.engine.Engine][MainThread] ()
+        2016-04-16 13:01:33,059 INFO  [sqlalchemy.engine.Engine][MainThread] COMMIT
+        2016-04-16 13:01:33,062 INFO  [sqlalchemy.engine.Engine][MainThread] BEGIN (implicit)
+        2016-04-16 13:01:33,062 INFO  [sqlalchemy.engine.Engine][MainThread] INSERT INTO wikipages (title, body) VALUES (?, ?)
+        2016-04-16 13:01:33,063 INFO  [sqlalchemy.engine.Engine][MainThread] ('Root', '<p>Root</p>')
+        2016-04-16 13:01:33,063 INFO  [sqlalchemy.engine.Engine][MainThread] COMMIT
 
 #.  With our data now driven by SQLAlchemy queries, we need to update our ``databases/tutorial/views.py``:
 
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 270cf7b63..1c02a8ed2 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -14,7 +14,7 @@ listen = localhost:6543
 # Begin logging configuration
 
 [loggers]
-keys = root, tutorial, sqlalchemy.engine.base.Engine
+keys = root, tutorial, sqlalchemy.engine.Engine
 
 [logger_tutorial]
 level = DEBUG
@@ -31,10 +31,10 @@ keys = generic
 level = INFO
 handlers = console
 
-[logger_sqlalchemy.engine.base.Engine]
+[logger_sqlalchemy.engine.Engine]
 level = INFO
 handlers =
-qualname = sqlalchemy.engine.base.Engine
+qualname = sqlalchemy.engine.Engine
 
 [handler_console]
 class = StreamHandler
-- 
cgit v1.2.3


From e11c95b8f37b0eff61c1b11931e307468226ed5e Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Tue, 27 Dec 2022 19:07:42 +0100
Subject: Update reference to ORM in sqlalchemy

---
 docs/quick_tutorial/databases.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index db75d70ce..8d216d53d 100644
--- a/docs/quick_tutorial/databases.rst
+++ b/docs/quick_tutorial/databases.rst
@@ -13,8 +13,8 @@ Background
 Our Pyramid-based wiki application now needs database-backed storage of pages.
 This frequently means an SQL database. The Pyramid community strongly supports
 the :ref:`SQLAlchemy <sqla:index_toplevel>` project and its
-:ref:`object-relational mapper (ORM) <sqla:ormtutorial_toplevel>` as a
-convenient, Pythonic way to interface to databases.
+:ref:`object-relational mapper (ORM) <sqla:orm_toplevel>` as a convenient,
+Pythonic way to interface to databases.
 
 In this step we hook up SQLAlchemy to a SQLite database table, providing
 storage and retrieval for the wiki pages in the previous step.
-- 
cgit v1.2.3