Tarantool development patches archive
 help / color / mirror / Atom feed
From: Georgy Kirichenko <georgy@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Georgy Kirichenko <georgy@tarantool.org>
Subject: [tarantool-patches] [PATCH 1/5] Specify types for internal tables
Date: Sun, 15 Jul 2018 23:44:46 +0300	[thread overview]
Message-ID: <15e386c03773bdbe34e833e0947d5d9d2b0b90a1.1531686753.git.georgy@tarantool.org> (raw)
In-Reply-To: <cover.1531686753.git.georgy@tarantool.org>

---
 src/box/sql.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/box/sql.c b/src/box/sql.c
index 063743e87..12279d0e1 100644
--- a/src/box/sql.c
+++ b/src/box/sql.c
@@ -1234,7 +1234,7 @@ void tarantoolSqlite3LoadSchema(InitData *init)
 		init, TARANTOOL_SYS_SCHEMA_NAME,
 		BOX_SCHEMA_ID, 0,
 		"CREATE TABLE \""TARANTOOL_SYS_SCHEMA_NAME
-		"\" (\"key\" TEXT PRIMARY KEY, \"value\")"
+		"\" (\"key\" TEXT PRIMARY KEY, \"value\" TEXT)"
 	);
 
 	sql_schema_put(
@@ -1242,7 +1242,7 @@ void tarantoolSqlite3LoadSchema(InitData *init)
 		BOX_SPACE_ID, 0,
 		"CREATE TABLE \""TARANTOOL_SYS_SPACE_NAME
 		"\" (\"id\" INT PRIMARY KEY, \"owner\" INT, \"name\" TEXT, "
-		"\"engine\" TEXT, \"field_count\" INT, \"opts\", \"format\")"
+		"\"engine\" TEXT, \"field_count\" INT, \"opts\" BLOB, \"format\" BLOB)"
 	);
 
 	sql_schema_put(
@@ -1250,14 +1250,14 @@ void tarantoolSqlite3LoadSchema(InitData *init)
 		BOX_INDEX_ID, 0,
 		"CREATE TABLE \""TARANTOOL_SYS_INDEX_NAME"\" "
 		"(\"id\" INT, \"iid\" INT, \"name\" TEXT, \"type\" TEXT,"
-		"\"opts\", \"parts\", PRIMARY KEY (\"id\", \"iid\"))"
+		"\"opts\" BLOB, \"parts\" BLOB, PRIMARY KEY (\"id\", \"iid\"))"
 	);
 
 	sql_schema_put(
 		init, TARANTOOL_SYS_TRIGGER_NAME,
 		BOX_TRIGGER_ID, 0,
 		"CREATE TABLE \""TARANTOOL_SYS_TRIGGER_NAME"\" ("
-		"\"name\" TEXT PRIMARY KEY, \"space_id\" INT, \"opts\")"
+		"\"name\" TEXT PRIMARY KEY, \"space_id\" INT, \"opts\" BLOB)"
 	);
 
 	sql_schema_put(
@@ -1280,7 +1280,7 @@ void tarantoolSqlite3LoadSchema(InitData *init)
 		       "CREATE TABLE \""TARANTOOL_SYS_SQL_STAT1_NAME
 			       "\"(\"tbl\" text,"
 			       "\"idx\" text,"
-			       "\"stat\" not null,"
+			       "\"stat\" blob not null,"
 			       "PRIMARY KEY(\"tbl\", \"idx\"))");
 
 	sql_schema_put(init, TARANTOOL_SYS_SQL_STAT4_NAME, BOX_SQL_STAT4_ID, 0,
@@ -1290,7 +1290,7 @@ void tarantoolSqlite3LoadSchema(InitData *init)
 			       "\"neq\" text,"
 			       "\"nlt\" text,"
 			       "\"ndlt\" text,"
-			       "\"sample\","
+			       "\"sample\" blob,"
 			       "PRIMARY KEY(\"tbl\", \"idx\", \"sample\"))");
 
 	/* Read _space */
-- 
2.18.0

  reply	other threads:[~2018-07-15 20:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-15 20:44 [tarantool-patches] [PATCH 0/5] SQL static types Georgy Kirichenko
2018-07-15 20:44 ` Georgy Kirichenko [this message]
2018-07-15 20:44 ` [tarantool-patches] [PATCH 2/5] Split on_conflict_action and affinity Georgy Kirichenko
2018-07-15 20:44 ` [tarantool-patches] [PATCH 3/5] Annotate a sql function with affinity Georgy Kirichenko
2018-07-15 20:44 ` [tarantool-patches] [PATCH 4/5] Column type should be defined on table creation Georgy Kirichenko
2018-07-15 20:44 ` [tarantool-patches] [PATCH 5/5] Enforce space format for columns Georgy Kirichenko

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=15e386c03773bdbe34e833e0947d5d9d2b0b90a1.1531686753.git.georgy@tarantool.org \
    --to=georgy@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH 1/5] Specify types for internal tables' \
    /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