Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for START TRANSACTION syntax #60886

Merged
merged 7 commits into from Mar 25, 2024
Merged

Add support for START TRANSACTION syntax #60886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d529389
Add support for 'START TRANSACTION' syntax
ArctypeZach Mar 5, 2024
d596de7
update documentation
ArctypeZach Mar 5, 2024
34d327a
Revert "update documentation"
ArctypeZach Mar 5, 2024
f5cf61c
update documentation without autoformat
ArctypeZach Mar 5, 2024
b074477
use new syntax in a test
ArctypeZach Mar 5, 2024
7ed1be6
fix test comment
ArctypeZach Mar 5, 2024
1c61ef7
Merge branch 'master' into start-transaction
tavplubix Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/en/sql-reference/transactions.md
View file
Open in desktop
Expand Up @@ -127,7 +127,7 @@ See the [deployment](docs/en/deployment-guides/terminology.md) documentation for

#### Verify that experimental transactions are enabled

Issue a `BEGIN TRANSACTION` followed by a `ROLLBACK` to verify that experimental transactions are enabled, and that ClickHouse Keeper is enabled as it is used to track transactions.
Issue a `BEGIN TRANSACTION` or `START TRANSACTION` followed by a `ROLLBACK` to verify that experimental transactions are enabled, and that ClickHouse Keeper is enabled as it is used to track transactions.

```sql
BEGIN TRANSACTION
Expand Down
1 change: 1 addition & 0 deletions src/Parsers/CommonParsers.h
View file
Open in desktop
Expand Up @@ -445,6 +445,7 @@ namespace DB
MR_MACROS(SPATIAL, "SPATIAL") \
MR_MACROS(SQL_SECURITY, "SQL SECURITY") \
MR_MACROS(SS, "SS") \
MR_MACROS(START_TRANSACTION, "START TRANSACTION") \
MR_MACROS(STATISTIC, "STATISTIC") \
MR_MACROS(STEP, "STEP") \
MR_MACROS(STORAGE, "STORAGE") \
Expand Down
2 changes: 2 additions & 0 deletions src/Parsers/ParserTransactionControl.cpp
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@ bool ParserTransactionControl::parseImpl(Pos & pos, ASTPtr & node, Expected & ex

if (ParserKeyword(Keyword::BEGIN_TRANSACTION).ignore(pos, expected))
action = ASTTransactionControl::BEGIN;
else if (ParserKeyword(Keyword::START_TRANSACTION).ignore(pos, expected))
action = ASTTransactionControl::BEGIN;
else if (ParserKeyword(Keyword::COMMIT).ignore(pos, expected))
action = ASTTransactionControl::COMMIT;
else if (ParserKeyword(Keyword::ROLLBACK).ignore(pos, expected))
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_transactions/test.py
View file
Open in desktop
Expand Up @@ -67,8 +67,8 @@ def test_rollback_unfinished_on_restart1(start_cluster):
tx(1, "insert into mt values (5, 50)")
tx(1, "alter table mt update m = m+n in partition id '1' where 1")

# check that uncommitted insert will be rolled back on restart
tx(3, "begin transaction")
# check that uncommitted insert will be rolled back on restart (using `START TRANSACTION` syntax)
tx(3, "start transaction")
tid5 = tx(3, "select transactionID()").strip()
tx(3, "insert into mt values (6, 70)")

Expand Down