diff options
Diffstat (limited to 'doc/build/core')
-rw-r--r-- | doc/build/core/connections.rst | 4 | ||||
-rw-r--r-- | doc/build/core/defaults.rst | 2 | ||||
-rw-r--r-- | doc/build/core/engines.rst | 2 | ||||
-rw-r--r-- | doc/build/core/tutorial.rst | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/build/core/connections.rst b/doc/build/core/connections.rst index 709642ecf..adcbcf049 100644 --- a/doc/build/core/connections.rst +++ b/doc/build/core/connections.rst @@ -7,7 +7,7 @@ Working with Engines and Connections .. module:: sqlalchemy.engine This section details direct usage of the :class:`.Engine`, -:class:`.Connection`, and related objects. Its important to note that when +:class:`.Connection`, and related objects. It's important to note that when using the SQLAlchemy ORM, these objects are not generally accessed; instead, the :class:`.Session` object is used as the interface to the database. However, for applications that are built around direct usage of textual SQL @@ -295,7 +295,7 @@ Explicit, connectionless execution delivers the expression to the Implicit execution is also connectionless, and makes usage of the :meth:`~.Executable.execute` method on the expression itself. This method is provided as part of the -:class:`.Executable` class, which refers to a SQL statement that is sufficient +:class:`.Executable` class, which refers to an SQL statement that is sufficient for being invoked against the database. The method makes usage of the assumption that either an :class:`~sqlalchemy.engine.Engine` or diff --git a/doc/build/core/defaults.rst b/doc/build/core/defaults.rst index a7287a360..ab1506834 100644 --- a/doc/build/core/defaults.rst +++ b/doc/build/core/defaults.rst @@ -321,7 +321,7 @@ use case, add the flag ``optional=True`` to the provides no other option for generating primary key identifiers. The :class:`~sqlalchemy.schema.Sequence` object also has the ability to be -executed standalone like a SQL expression, which has the effect of calling its +executed standalone like an SQL expression, which has the effect of calling its "next value" function:: seq = Sequence('some_sequence') diff --git a/doc/build/core/engines.rst b/doc/build/core/engines.rst index 17ec9416c..a6950c949 100644 --- a/doc/build/core/engines.rst +++ b/doc/build/core/engines.rst @@ -160,7 +160,7 @@ And for an absolute file path, the three slashes are followed by the absolute pa #Windows alternative using raw string engine = create_engine(r'sqlite:///C:\path\to\foo.db') -To use a SQLite ``:memory:`` database, specify an empty URL:: +To use an SQLite ``:memory:`` database, specify an empty URL:: engine = create_engine('sqlite://') diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst index 0fd78abeb..fef3c9f2e 100644 --- a/doc/build/core/tutorial.rst +++ b/doc/build/core/tutorial.rst @@ -248,7 +248,7 @@ Executing The interesting part of an :class:`~sqlalchemy.sql.expression.Insert` is executing it. In this tutorial, we will generally focus on the most explicit -method of executing a SQL construct, and later touch upon some "shortcut" ways +method of executing an SQL construct, and later touch upon some "shortcut" ways to do it. The ``engine`` object we created is a repository for database connections capable of issuing SQL to the database. To acquire a connection, we use the ``connect()`` method:: @@ -552,7 +552,7 @@ some of its capabilities. We've seen how to equate two columns to each other: >>> print(users.c.id == addresses.c.user_id) users.id = addresses.user_id -If we use a literal value (a literal meaning, not a SQLAlchemy clause object), +If we use a literal value (a literal meaning, not an SQLAlchemy clause object), we get a bind parameter: .. sourcecode:: pycon+sql @@ -569,7 +569,7 @@ we did with the :class:`~sqlalchemy.sql.expression.Insert` object to see it: >>> (users.c.id == 7).compile().params {u'id_1': 7} -Most Python operators, as it turns out, produce a SQL expression here, like +Most Python operators, as it turns out, produce an SQL expression here, like equals, not equals, etc.: .. sourcecode:: pycon+sql |