summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-12-30 11:08:44 -0600
committerGitHub <noreply@github.com>2022-12-30 11:08:44 -0600
commit93a69202dc225dc5ae659824751f59c2d33f6373 (patch)
treef7c7b75cedfbfa3bb17257abd55d2eeaae8facec /docs
parent7ecd8d6f75d9d21f3f7b10e4c84958cf3aa8fb17 (diff)
parent4703e60eb7ddb870bf2cc69eaafd8e12fa966636 (diff)
downloadpyramid-93a69202dc225dc5ae659824751f59c2d33f6373.tar.gz
pyramid-93a69202dc225dc5ae659824751f59c2d33f6373.tar.bz2
pyramid-93a69202dc225dc5ae659824751f59c2d33f6373.zip
Merge branch 'master' into py311
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tutorial/databases.rst30
-rw-r--r--docs/quick_tutorial/databases/development.ini6
2 files changed, 18 insertions, 18 deletions
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index db75d70ce..5582e6101 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.
@@ -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