Tarantool development patches archive
 help / color / mirror / Atom feed
From: Ivan Koptelov <ivan.koptelov@tarantool.org>
To: tarantool-patches@freelists.org
Cc: korablev@tarantool.org, Ivan Koptelov <ivan.koptelov@tarantool.org>
Subject: [tarantool-patches] [PATCH] sql: raise err on CHECK + ON CONFLICT REPLACE
Date: Mon,  4 Feb 2019 17:44:14 +0300	[thread overview]
Message-ID: <20190204144414.91752-1-ivan.koptelov@tarantool.org> (raw)

Adds error raise in case of CHECK constraint declared with ON
CONFLICT REPLACE action. Before the patch such option was
forbidden, but if a user tried to create space with such constraint,
this attempt failed silently.

Closes #3345
---
Branch https://github.com/tarantool/tarantool/tree/sudobobo/gh-3345-raise-err-on-CHECK-w-ON-CONFLICT-REPLACE
Issue https://github.com/tarantool/tarantool/issues/3345

 src/box/sql/build.c         | 12 ++++++++++++
 test/sql-tap/check.test.lua | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index 49b90b5d0..e43694e0b 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -761,6 +761,18 @@ sql_add_check_constraint(struct Parse *parser, struct ExprSpan *span)
 {
 	struct Expr *expr = span->pExpr;
 	struct Table *table = parser->pNewTable;
+
+	if (strcasestr(span->zEnd, "on conflict replace") != NULL) {
+		diag_set(ClientError, ER_CREATE_SPACE, table->def->name,
+			 "ON CONFLICT REPLACE action is not allowed for "
+			 "CHECK constraint");
+		parser->rc = SQL_TARANTOOL_ERROR;
+		parser->nErr++;
+		sqlite3DbFree(parser->db, expr->u.zToken);
+
+		goto release_expr;
+	}
+
 	if (table != NULL) {
 		expr->u.zToken =
 			sqlite3DbStrNDup(parser->db, (char *)span->zStart,
diff --git a/test/sql-tap/check.test.lua b/test/sql-tap/check.test.lua
index 1f369fb02..b6e17c059 100755
--- a/test/sql-tap/check.test.lua
+++ b/test/sql-tap/check.test.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env tarantool
 test = require("sqltester")
-test:plan(58)
+test:plan(59)
 
 --!./tcltestrunner.lua
 -- 2005 November 2
@@ -772,5 +772,19 @@ test:do_execsql_test(
         -- </8.1>
     })
 
+-- gh-3345 : the test checks that ON CONFLICT REPLACE
+-- is not allowed for CHECK constraint.
+test:do_catchsql_test(
+        9.1,
+        [[
+            CREATE TABLE t101 (a INT primary key, b INT, CHECK(b < 10)
+            ON CONFLICT REPLACE)
+        ]], {
+            -- <9.1>
+            1, "Failed to create space 'T101': ON CONFLICT REPLACE " ..
+                    "action is not allowed for CHECK constraint"
+            -- </9.1>
+        })
+
 test:finish_test()
 
-- 
2.14.3 (Apple Git-98)

             reply	other threads:[~2019-02-04 14:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-04 14:44 Ivan Koptelov [this message]
2019-02-04 15:28 ` [tarantool-patches] " n.pettik
     [not found] <821d032b-9adf-6496-c0bc-f0f9497c5f83@tarantool.org>
2019-02-04 17:05 ` Ivan Koptelov
2019-02-05 13:44   ` n.pettik
2019-02-07 18:40     ` [tarantool-patches] " i.koptelov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190204144414.91752-1-ivan.koptelov@tarantool.org \
    --to=ivan.koptelov@tarantool.org \
    --cc=korablev@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH] sql: raise err on CHECK + ON CONFLICT REPLACE' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox