Tarantool development patches archive
 help / color / mirror / Atom feed
From: imeevma@tarantool.org
To: alexander.turenko@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH 1/1] sql: add another way to change SQL default engine
Date: Fri, 27 Dec 2019 15:33:12 +0300	[thread overview]
Message-ID: <4f09686e246ae3507121bb66e07cbe1e5c94c608.1577449923.git.imeevma@gmail.com> (raw)

Due to the removal of the sql_default_engine pragma in 2.3.1, this
patch adds another way to change this setting.
---
https://github.com/tarantool/test-run/tree/imeevma/fix_sql_default_engine

 lib/tarantool_server.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/tarantool_server.py b/lib/tarantool_server.py
index 6f71b5b..20a398e 100644
--- a/lib/tarantool_server.py
+++ b/lib/tarantool_server.py
@@ -145,12 +145,19 @@ class LuaTest(Test):
             return True
 
         engine = self.run_params['engine']
-        command = "pragma sql_default_engine='{}'".format(engine)
-        result = self.send_command(command, ts, 'sql')
-        result = result.replace('\r\n', '\n')
-        if result != '---\n- row_count: 0\n...\n':
-            sys.stdout.write(result)
-            return False
+
+        command_new = ("UPDATE \"_session_settings\" SET \"value\" = '{}' " + \
+                       "WHERE \"name\" = 'sql_default_engine'").format(engine)
+        result_new = self.send_command(command_new, ts, 'sql')
+        result_new = result_new.replace('\r\n', '\n')
+
+        command_old = "pragma sql_default_engine='{}'".format(engine)
+        result_old = self.send_command(command_old, ts, 'sql')
+        result_old = result_old.replace('\r\n', '\n')
+        if result_new != '---\n- row_count: 1\n...\n':
+            if result_old != '---\n- row_count: 0\n...\n':
+                sys.stdout.write(result_old)
+                return False
 
         return True
 
-- 
2.7.4

             reply	other threads:[~2019-12-27 12:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-27 12:33 imeevma [this message]
2019-12-28 10:57 ` Alexander Turenko

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=4f09686e246ae3507121bb66e07cbe1e5c94c608.1577449923.git.imeevma@gmail.com \
    --to=imeevma@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 1/1] sql: add another way to change SQL default engine' \
    /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