Skip to content

Commit

Permalink
Restored what disappeared from branch 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
pgulutzan committed Dec 31, 2019
1 parent 713a1fa commit 1147d2b
Show file tree
Hide file tree
Showing 5 changed files with 3,464 additions and 149 deletions.
7 changes: 4 additions & 3 deletions doc/book/box/box_sql.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ Functions for SQL
The ``box`` module contains two functions related to SQL:

* ``box.schema.func.create`` -- for making Lua functions callable from
SQL statements. This will be part of
the documentation regarding SQL Plus Lua.
SQL statements. See :ref:`Calling Lua routines from SQL <sql_calling_lua>`
in the :ref:`SQL Plus Lua <sql_sql_plus_lua>` section.

* ``box.execute`` -- for making SQL statements callable from Lua functions.
See the :ref:`SQL user guide <sql_sql_user_guide>`.

Some SQL statements are illustrated in the :ref:`SQL tutorial <sql_tutorial>`.

Expand All @@ -20,7 +21,7 @@ Some SQL statements are illustrated in the :ref:`SQL tutorial <sql_tutorial>`.

Execute the SQL statement contained in the sql-statement parameter.

:param string sql-statement: statement, which should conform to the rules for SQL grammar
:param string sql-statement: statement, which should conform to :ref:`the rules for SQL grammar <sql_sql_statements_and_clauses>`
:param table extra-parameters: optional list for placeholders in the statement

:return: depends on statement
Expand Down
17 changes: 17 additions & 0 deletions doc/reference/reference_sql/column_constraint.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
stack (
line(
choice(
None,
line(' CONSTRAINT ', 'name')
)
),
line(
choice(
line(' PRIMARY ', ' KEY '),
line(' NOT NULL '),
line(' UNIQUE '),
line(' DEFAULT ', 'expression'),
line('foreign-key-clause')
)
)
)
110 changes: 110 additions & 0 deletions doc/reference/reference_sql/column_constraint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1147d2b

Please sign in to comment.