Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH 0/2] Update some sql tests against static types
@ 2018-04-19  9:15 Georgy Kirichenko
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 1/2] Convert some tests into a static-types form Georgy Kirichenko
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 2/2] Fix some sql tests against static types Georgy Kirichenko
  0 siblings, 2 replies; 5+ messages in thread
From: Georgy Kirichenko @ 2018-04-19  9:15 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Georgy Kirichenko

Update some sql tests against static types. This should be done before a
static type casting will be introduced into a sql engine. By default all
undefined columns defined as INT with manually adjusting in case of an
errors.

branch: ihttps://github.com/tarantool/tarantool/tree/gh-3102-autoconvert-test-for-types
issue: #3102

Georgy Kirichenko (2):
  Convert some tests into a static-types form.
  Fix some sql tests against static types

 test/sql-tap/alias.test.lua                   |  2 +-
 test/sql-tap/analyze1.test.lua                | 12 +--
 test/sql-tap/analyze4.test.lua                |  4 +-
 test/sql-tap/analyze8.test.lua                |  2 +-
 test/sql-tap/analyzeC.test.lua                |  2 +-
 test/sql-tap/autoindex4.test.lua              |  6 +-
 test/sql-tap/coalesce.test.lua                |  2 +-
 test/sql-tap/collation.test.lua               |  2 +-
 test/sql-tap/colname.test.lua                 | 20 ++--
 test/sql-tap/distinctagg.test.lua             |  2 +-
 test/sql-tap/drop_all.test.lua                |  2 +-
 test/sql-tap/e_expr.test.lua                  | 20 ++--
 test/sql-tap/fkey3.test.lua                   | 10 +-
 test/sql-tap/func.test.lua                    | 20 ++--
 ...2360-omit-truncate-in-transaction.test.lua |  2 +-
 test/sql-tap/gh-2723-concurrency.test.lua     |  6 +-
 .../gh-2884-forbid-rowid-syntax.test.lua      |  2 +-
 .../gh-2953-drop-table-with-FK.test.lua       |  8 +-
 test/sql-tap/gh-2996-indexed-by.test.lua      |  2 +-
 .../sql-tap/gh2130-index-refer-table.test.lua |  4 +-
 .../gh2250-trigger-chain-limit.test.lua       |  2 +-
 test/sql-tap/icu.test.lua                     |  4 +-
 test/sql-tap/identifier-characters.test.lua   |  6 +-
 test/sql-tap/identifier_case.test.lua         |  4 +-
 test/sql-tap/in2.test.lua                     |  2 +-
 test/sql-tap/index7.test.lua                  | 10 +-
 test/sql-tap/insert1.test.lua                 | 22 ++---
 test/sql-tap/intpkey.test.lua                 |  8 +-
 test/sql-tap/join.test.lua                    | 50 +++++-----
 test/sql-tap/join2.test.lua                   |  6 +-
 test/sql-tap/join6.test.lua                   | 18 ++--
 test/sql-tap/keyword1.test.lua                |  2 +-
 test/sql-tap/like3.test.lua                   |  4 +-
 test/sql-tap/limit.test.lua                   | 12 +--
 test/sql-tap/minmax4.test.lua                 |  4 +-
 test/sql-tap/offset1.test.lua                 |  4 +-
 test/sql-tap/orderby1.test.lua                |  6 +-
 test/sql-tap/orderby4.test.lua                |  8 +-
 test/sql-tap/orderby5.test.lua                |  8 +-
 test/sql-tap/orderby8.test.lua                |  2 +-
 test/sql-tap/printf2.test.lua                 |  2 +-
 test/sql-tap/select4.test.lua                 |  8 +-
 test/sql-tap/select5.test.lua                 | 10 +-
 test/sql-tap/select8.test.lua                 |  2 +-
 test/sql-tap/select9.test.lua                 | 12 +--
 test/sql-tap/selectF.test.lua                 |  4 +-
 test/sql-tap/selectG.test.lua                 |  2 +-
 test/sql-tap/table.test.lua                   | 92 +++++++++----------
 test/sql-tap/tkt-02a8e81d44.test.lua          |  2 +-
 test/sql-tap/tkt-385a5b56b9.test.lua          |  4 +-
 test/sql-tap/tkt-4c86b126f2.test.lua          |  2 +-
 test/sql-tap/tkt-4dd95f6943.test.lua          | 10 +-
 test/sql-tap/tkt-54844eea3f.test.lua          |  2 +-
 test/sql-tap/tkt-8c63ff0ec.test.lua           |  4 +-
 test/sql-tap/tkt-a7b7803e.test.lua            |  2 +-
 test/sql-tap/tkt-b75a9ca6b0.test.lua          |  2 +-
 test/sql-tap/tkt-f973c7ac31.test.lua          |  2 +-
 test/sql-tap/tkt-fa7bf5ec.test.lua            |  2 +-
 test/sql-tap/tkt1473.test.lua                 |  4 +-
 test/sql-tap/tkt1501.test.lua                 |  2 +-
 test/sql-tap/tkt1514.test.lua                 |  2 +-
 test/sql-tap/tkt1537.test.lua                 |  4 +-
 test/sql-tap/tkt2832.test.lua                 |  6 +-
 test/sql-tap/tkt3424.test.lua                 |  2 +-
 test/sql-tap/tkt3541.test.lua                 |  2 +-
 test/sql-tap/tkt3581.test.lua                 |  4 +-
 test/sql-tap/tkt3773.test.lua                 |  4 +-
 test/sql-tap/tkt3911.test.lua                 |  6 +-
 test/sql-tap/tkt3935.test.lua                 |  4 +-
 test/sql-tap/trigger1.test.lua                | 40 ++++----
 test/sql-tap/trigger4.test.lua                |  6 +-
 test/sql-tap/trigger7.test.lua                |  4 +-
 test/sql-tap/trigger8.test.lua                |  4 +-
 test/sql-tap/triggerC.test.lua                | 66 ++++++-------
 test/sql-tap/triggerD.test.lua                | 16 ++--
 test/sql-tap/triggerE.test.lua                |  6 +-
 test/sql-tap/view.test.lua                    | 30 +++---
 test/sql-tap/where4.test.lua                  | 22 ++---
 test/sql-tap/where7.test.lua                  |  6 +-
 test/sql-tap/whereA.test.lua                  |  4 +-
 test/sql-tap/whereC.test.lua                  |  2 +-
 test/sql-tap/whereF.test.lua                  | 14 +--
 test/sql/check-clear-ephemeral.result         |  2 +-
 test/sql/check-clear-ephemeral.test.lua       |  2 +-
 test/sql/clear.result                         |  2 +-
 test/sql/clear.test.lua                       |  2 +-
 test/sql/delete-multiple-idx.result           |  2 +-
 test/sql/delete-multiple-idx.test.lua         |  2 +-
 test/sql/delete.result                        |  2 +-
 test/sql/delete.test.lua                      |  2 +-
 test/sql/drop-index.result                    |  2 +-
 test/sql/drop-index.test.lua                  |  2 +-
 test/sql/drop-table.result                    |  2 +-
 test/sql/drop-table.test.lua                  |  2 +-
 test/sql/errinj.result                        |  2 +-
 test/sql/errinj.test.lua                      |  2 +-
 test/sql/gh-2929-primary-key.result           | 10 +-
 test/sql/gh-2929-primary-key.test.lua         | 10 +-
 test/sql/gh-3199-no-mem-leaks.result          |  6 +-
 test/sql/gh-3199-no-mem-leaks.test.lua        |  6 +-
 .../gh2141-delete-trigger-drop-table.result   |  2 +-
 .../gh2141-delete-trigger-drop-table.test.lua |  2 +-
 test/sql/gh2251-multiple-update.result        |  4 +-
 test/sql/gh2251-multiple-update.test.lua      |  4 +-
 ...808-inline-unique-persistency-check.result |  2 +-
 ...8-inline-unique-persistency-check.test.lua |  2 +-
 test/sql/insert-unique.result                 |  2 +-
 test/sql/insert-unique.test.lua               |  2 +-
 test/sql/iproto.result                        |  6 +-
 test/sql/iproto.test.lua                      |  6 +-
 test/sql/max-on-index.result                  |  2 +-
 test/sql/max-on-index.test.lua                |  2 +-
 test/sql/misc.result                          |  2 +-
 test/sql/misc.test.lua                        |  2 +-
 test/sql/persistency.result                   | 10 +-
 test/sql/persistency.test.lua                 |  8 +-
 test/sql/select-null.result                   |  2 +-
 test/sql/select-null.test.lua                 |  2 +-
 test/sql/transition.result                    | 10 +-
 test/sql/transition.test.lua                  | 10 +-
 test/sql/update-with-nested-select.result     |  2 +-
 test/sql/update-with-nested-select.test.lua   |  2 +-
 test/sql/view.result                          |  2 +-
 test/sql/view.test.lua                        |  2 +-
 124 files changed, 441 insertions(+), 445 deletions(-)

-- 
2.17.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tarantool-patches] [PATCH 1/2] Convert some tests into a static-types form.
  2018-04-19  9:15 [tarantool-patches] [PATCH 0/2] Update some sql tests against static types Georgy Kirichenko
@ 2018-04-19  9:15 ` Georgy Kirichenko
  2018-04-19  9:26   ` [tarantool-patches] " Vladislav Shpilevoy
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 2/2] Fix some sql tests against static types Georgy Kirichenko
  1 sibling, 1 reply; 5+ messages in thread
From: Georgy Kirichenko @ 2018-04-19  9:15 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Georgy Kirichenko

This is preparation for a static type casting.
Need for #3102
---
 test/sql-tap/alias.test.lua                   |  2 +-
 test/sql-tap/analyze1.test.lua                | 12 +--
 test/sql-tap/analyze4.test.lua                |  4 +-
 test/sql-tap/analyze8.test.lua                |  2 +-
 test/sql-tap/analyzeC.test.lua                |  2 +-
 test/sql-tap/autoindex4.test.lua              |  6 +-
 test/sql-tap/coalesce.test.lua                |  2 +-
 test/sql-tap/collation.test.lua               |  2 +-
 test/sql-tap/colname.test.lua                 | 20 ++--
 test/sql-tap/distinctagg.test.lua             |  2 +-
 test/sql-tap/drop_all.test.lua                |  2 +-
 test/sql-tap/e_expr.test.lua                  | 20 ++--
 test/sql-tap/fkey3.test.lua                   | 10 +-
 test/sql-tap/func.test.lua                    | 20 ++--
 ...2360-omit-truncate-in-transaction.test.lua |  2 +-
 test/sql-tap/gh-2723-concurrency.test.lua     |  6 +-
 .../gh-2884-forbid-rowid-syntax.test.lua      |  2 +-
 .../gh-2953-drop-table-with-FK.test.lua       |  8 +-
 test/sql-tap/gh-2996-indexed-by.test.lua      |  2 +-
 .../sql-tap/gh2130-index-refer-table.test.lua |  4 +-
 .../gh2250-trigger-chain-limit.test.lua       |  2 +-
 test/sql-tap/icu.test.lua                     |  4 +-
 test/sql-tap/identifier-characters.test.lua   |  6 +-
 test/sql-tap/identifier_case.test.lua         |  4 +-
 test/sql-tap/in2.test.lua                     |  2 +-
 test/sql-tap/index7.test.lua                  | 10 +-
 test/sql-tap/insert1.test.lua                 | 22 ++---
 test/sql-tap/intpkey.test.lua                 |  8 +-
 test/sql-tap/join.test.lua                    | 50 +++++-----
 test/sql-tap/join2.test.lua                   |  6 +-
 test/sql-tap/join6.test.lua                   | 18 ++--
 test/sql-tap/keyword1.test.lua                |  2 +-
 test/sql-tap/like3.test.lua                   |  4 +-
 test/sql-tap/limit.test.lua                   | 12 +--
 test/sql-tap/minmax4.test.lua                 |  4 +-
 test/sql-tap/offset1.test.lua                 |  4 +-
 test/sql-tap/orderby1.test.lua                |  6 +-
 test/sql-tap/orderby4.test.lua                |  8 +-
 test/sql-tap/orderby5.test.lua                |  8 +-
 test/sql-tap/orderby8.test.lua                |  2 +-
 test/sql-tap/printf2.test.lua                 |  2 +-
 test/sql-tap/select4.test.lua                 |  8 +-
 test/sql-tap/select5.test.lua                 | 10 +-
 test/sql-tap/select8.test.lua                 |  2 +-
 test/sql-tap/select9.test.lua                 | 12 +--
 test/sql-tap/selectF.test.lua                 |  4 +-
 test/sql-tap/selectG.test.lua                 |  2 +-
 test/sql-tap/table.test.lua                   | 92 +++++++++----------
 test/sql-tap/tkt-02a8e81d44.test.lua          |  2 +-
 test/sql-tap/tkt-385a5b56b9.test.lua          |  4 +-
 test/sql-tap/tkt-4c86b126f2.test.lua          |  2 +-
 test/sql-tap/tkt-4dd95f6943.test.lua          | 10 +-
 test/sql-tap/tkt-54844eea3f.test.lua          |  2 +-
 test/sql-tap/tkt-8c63ff0ec.test.lua           |  4 +-
 test/sql-tap/tkt-a7b7803e.test.lua            |  2 +-
 test/sql-tap/tkt-b75a9ca6b0.test.lua          |  2 +-
 test/sql-tap/tkt-f973c7ac31.test.lua          |  2 +-
 test/sql-tap/tkt-fa7bf5ec.test.lua            |  2 +-
 test/sql-tap/tkt1473.test.lua                 |  4 +-
 test/sql-tap/tkt1501.test.lua                 |  2 +-
 test/sql-tap/tkt1514.test.lua                 |  2 +-
 test/sql-tap/tkt1537.test.lua                 |  4 +-
 test/sql-tap/tkt2832.test.lua                 |  6 +-
 test/sql-tap/tkt3424.test.lua                 |  2 +-
 test/sql-tap/tkt3541.test.lua                 |  2 +-
 test/sql-tap/tkt3581.test.lua                 |  4 +-
 test/sql-tap/tkt3773.test.lua                 |  4 +-
 test/sql-tap/tkt3911.test.lua                 |  6 +-
 test/sql-tap/tkt3935.test.lua                 |  4 +-
 test/sql-tap/trigger1.test.lua                | 40 ++++----
 test/sql-tap/trigger4.test.lua                |  6 +-
 test/sql-tap/trigger7.test.lua                |  4 +-
 test/sql-tap/trigger8.test.lua                |  4 +-
 test/sql-tap/triggerC.test.lua                | 66 ++++++-------
 test/sql-tap/triggerD.test.lua                | 16 ++--
 test/sql-tap/triggerE.test.lua                |  6 +-
 test/sql-tap/view.test.lua                    | 30 +++---
 test/sql-tap/where4.test.lua                  | 22 ++---
 test/sql-tap/where7.test.lua                  |  6 +-
 test/sql-tap/whereA.test.lua                  |  4 +-
 test/sql-tap/whereC.test.lua                  |  2 +-
 test/sql-tap/whereF.test.lua                  | 14 +--
 82 files changed, 366 insertions(+), 370 deletions(-)

diff --git a/test/sql-tap/alias.test.lua b/test/sql-tap/alias.test.lua
index 4321413cb..b7afb669d 100755
--- a/test/sql-tap/alias.test.lua
+++ b/test/sql-tap/alias.test.lua
@@ -38,7 +38,7 @@ test:do_test(
     "alias-1.1",
     function()
         return test:execsql([[
-            CREATE TABLE t1(x primary key);
+            CREATE TABLE t1(x INT primary key);
             INSERT INTO t1 VALUES(9);
             INSERT INTO t1 VALUES(8);
             INSERT INTO t1 VALUES(7);
diff --git a/test/sql-tap/analyze1.test.lua b/test/sql-tap/analyze1.test.lua
index 5d91d963f..931b57d7b 100755
--- a/test/sql-tap/analyze1.test.lua
+++ b/test/sql-tap/analyze1.test.lua
@@ -94,7 +94,7 @@ test:do_execsql_test(
 test:do_catchsql_test(
     "analyze-1.10",
     [[
-        CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a,b);
+        CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a INT,b INT);
         ANALYZE t1;
     ]], {
         -- <analyze-1.10>
@@ -192,7 +192,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "analyze-3.4",
     [[
-        CREATE TABLE t2 (id INTEGER PRIMARY KEY AUTOINCREMENT, a, b);
+        CREATE TABLE t2 (id INTEGER PRIMARY KEY AUTOINCREMENT, a INT, b INT);
         INSERT INTO t2 SELECT * FROM t1;
         CREATE INDEX t2i1 ON t2(a);
         CREATE INDEX t2i2 ON t2(b);
@@ -243,7 +243,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "analyze-3.8",
     [[
-        CREATE TABLE t3 (id INTEGER PRIMARY KEY AUTOINCREMENT, a,b,c,d);
+        CREATE TABLE t3 (id INTEGER PRIMARY KEY AUTOINCREMENT, a INT,b INT,c INT,d INT);
         INSERT INTO t3 (a,b,c,d) SELECT a, b, id AS c, 'hi' AS d FROM t1;
         CREATE INDEX t3i1 ON t3(a);
         CREATE INDEX t3i2 ON t3(a,b,c,d);
@@ -271,7 +271,7 @@ test:do_execsql_test(
 -- test:do_execsql_test(
 --     "analyze-3.10",
 --     [[
---         CREATE TABLE [silly " name](id INTEGER PRIMARY KEY AUTOINCREMENT, a, b, c);
+--         CREATE TABLE [silly " name](id INTEGER PRIMARY KEY AUTOINCREMENT, a INT, b INT, c INT);
 --         CREATE INDEX 'foolish '' name' ON [silly " name](a, b);
 --         CREATE INDEX 'another foolish '' name' ON [silly " name](c);
 --         INSERT INTO [silly " name] (a,b,c) VALUES(1, 2, 3);
@@ -312,7 +312,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "analyze-4.0",
     [[
-        CREATE TABLE t4(id INTEGER PRIMARY KEY AUTOINCREMENT, x,y,z);
+        CREATE TABLE t4(id INTEGER PRIMARY KEY AUTOINCREMENT, x INT,y INT,z INT);
         CREATE INDEX t4i1 ON t4(x);
         CREATE INDEX t4i2 ON t4(y);
         INSERT INTO t4 SELECT id,a,b,c FROM t3;
@@ -356,7 +356,7 @@ test:do_execsql_test(
     [[
         DELETE FROM t3;
         DROP TABLE IF EXISTS t4;
-        CREATE TABLE t4(ud INTEGER PRIMARY KEY AUTOINCREMENT, x,y,z);
+        CREATE TABLE t4(ud INTEGER PRIMARY KEY AUTOINCREMENT, x INT,y INT,z INT);
         CREATE INDEX t4i1 ON t4(x);
         CREATE INDEX t4i2 ON t4(y);
         INSERT INTO t3 (a,b,c,d) VALUES(1,2,3,4);
diff --git a/test/sql-tap/analyze4.test.lua b/test/sql-tap/analyze4.test.lua
index f71d394bd..32f9c8336 100755
--- a/test/sql-tap/analyze4.test.lua
+++ b/test/sql-tap/analyze4.test.lua
@@ -28,7 +28,7 @@ test:do_test(
     "analyze4-1.0",
     function()
         test:execsql([[
-            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a,b);
+            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a INT,b INT);
             CREATE INDEX t1a ON t1(a);
             CREATE INDEX t1b ON t1(b);
             INSERT INTO t1 (a,b) VALUES(1,NULL);
@@ -94,7 +94,7 @@ test:do_execsql_test(
             --ALTER TABLE t1 ADD COLUMN d;
             -- So, re-create the table and its contents
             DROP TABLE t1;
-            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a,b,c DEFAULT NULL,d DEFAULT NULL);
+            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a INT,b INT,c INT DEFAULT NULL,d INT DEFAULT NULL);
             CREATE INDEX t1a ON t1(a);
             CREATE INDEX t1b ON t1(b);
             INSERT INTO t1 (a,b) VALUES(1,NULL);
diff --git a/test/sql-tap/analyze8.test.lua b/test/sql-tap/analyze8.test.lua
index e06e3ed87..894a1bc36 100755
--- a/test/sql-tap/analyze8.test.lua
+++ b/test/sql-tap/analyze8.test.lua
@@ -33,7 +33,7 @@ test:do_test(
     1.0,
     function()
         test:execsql([[
-            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a,b,c,d);
+            CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT, a INT,b INT,c INT,d INT);
             CREATE INDEX t1a ON t1(a);
             CREATE INDEX t1b ON t1(b);
             CREATE INDEX t1c ON t1(c);
diff --git a/test/sql-tap/analyzeC.test.lua b/test/sql-tap/analyzeC.test.lua
index a3cea7056..2167585d1 100755
--- a/test/sql-tap/analyzeC.test.lua
+++ b/test/sql-tap/analyzeC.test.lua
@@ -34,7 +34,7 @@ test:do_execsql_test(
     1.0,
     [[
         DROP TABLE IF EXISTS t1;
-        CREATE TABLE t1(a PRIMARY KEY, b, c, d);
+        CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT, d INT);
         INSERT INTO t1(a,b,c,d) VALUES(1,1,2,3),(2,7,8,9),(3,4,5,6),(4,10,11,12),(5,4,8,12),(6,1,11,111);
         CREATE INDEX t1b ON t1(b);
         CREATE INDEX t1c ON t1(c);
diff --git a/test/sql-tap/autoindex4.test.lua b/test/sql-tap/autoindex4.test.lua
index 45bae4866..42b7e03ed 100755
--- a/test/sql-tap/autoindex4.test.lua
+++ b/test/sql-tap/autoindex4.test.lua
@@ -23,9 +23,9 @@ test:plan(7)
 test:do_execsql_test(
     "autoindex4-1.0",
     [[
-        CREATE TABLE t1(a,b, primary key(a,b));
+        CREATE TABLE t1(a INT,b INT, primary key(a,b));
         INSERT INTO t1 VALUES(123,'abc'),(234,'def'),(234,'ghi'),(345,'jkl');
-        CREATE TABLE t2(x,y, primary key(x,y));
+        CREATE TABLE t2(x INT,y INT, primary key(x,y));
         INSERT INTO t2 VALUES(987,'zyx'),(654,'wvu'),(987,'rqp');
 
         SELECT *, '|' FROM t1, t2 WHERE a=234 AND x=987 ORDER BY +b;
@@ -76,7 +76,7 @@ test:do_execsql_test(
     })
 
 -- do_execsql_test autoindex4-2.0 {
---   CREATE TABLE t3(e,f);
+--   CREATE TABLE t3(e INT,f INT);
 --   INSERT INTO t3 VALUES(123,654),(555,444),(234,987);
 --   SELECT (SELECT count(*) FROM t1, t2 WHERE a=e AND x=f), e, f, '|'
 --     FROM t3
diff --git a/test/sql-tap/coalesce.test.lua b/test/sql-tap/coalesce.test.lua
index ef177c925..5740c1b37 100755
--- a/test/sql-tap/coalesce.test.lua
+++ b/test/sql-tap/coalesce.test.lua
@@ -21,7 +21,7 @@ test:do_test(
     "coalesce-1.0",
     function()
         return test:execsql [[
-            CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c, d);
+            CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT, c INT, d INT);
             INSERT INTO t1 VALUES(1, null, null, null);
             INSERT INTO t1 VALUES(2, 2, 99, 99);
             INSERT INTO t1 VALUES(3, null, 3, 99);
diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua
index 8a98de987..e8f09fdae 100755
--- a/test/sql-tap/collation.test.lua
+++ b/test/sql-tap/collation.test.lua
@@ -167,7 +167,7 @@ for _, data_collation in ipairs(data_collations) do
         local result = test_case[3]
         test:do_execsql_test(
             extendex_prefix.."create_table",
-            string.format("create table t1(a primary key, b %s);", data_collation[1]),
+            string.format("create table t1(a INT primary key, b TEXT %s);", data_collation[1]),
             {})
         test:do_test(
             extendex_prefix.."insert_values",
diff --git a/test/sql-tap/colname.test.lua b/test/sql-tap/colname.test.lua
index c96623e4e..778a87d5f 100755
--- a/test/sql-tap/colname.test.lua
+++ b/test/sql-tap/colname.test.lua
@@ -72,11 +72,11 @@ test:do_test(
     "colname-2.1",
     function()
         test:execsql [[
-            CREATE TABLE tabc(a PRIMARY KEY,b,c);
+            CREATE TABLE tabc(a INT PRIMARY KEY,b INT,c INT);
             INSERT INTO tabc VALUES(1,2,3);
-            CREATE TABLE txyz(x PRIMARY KEY,y,z);
+            CREATE TABLE txyz(x INT PRIMARY KEY,y INT,z INT);
             INSERT INTO txyz VALUES(4,5,6);
-            CREATE TABLE tboth(a PRIMARY KEY,b,c,x,y,z);
+            CREATE TABLE tboth(a INT PRIMARY KEY,b INT,c INT,x INT,y INT,z INT);
             INSERT INTO tboth VALUES(11,12,13,14,15,16);
             CREATE VIEW v1 AS SELECT tabC.a, txyZ.x, * 
               FROM tabc, txyz ORDER BY 1 LIMIT 1;
@@ -442,7 +442,7 @@ test:do_execsql2_test(
 --            return lreplace( test:execsql("SELECT x.* FROM sqlite_master X LIMIT 1;"), 3, 3,"x")
 --        end, {
 --            -- <colname-5.1>
---            "table", "tabc", "tabc", "x", "CREATE TABLE tabc(a,b,c)"
+--            "table", "tabc", "tabc", "x", "CREATE TABLE tabc(a INT,b INT,c INT)"
 --            -- </colname-5.1>
 --        })
 
@@ -460,7 +460,7 @@ test:do_test(
             PRAGMA full_column_names='OFF';
             ]])
         test:execsql [=[
-            CREATE TABLE t6(a primary key, "'a'", """a""", "[a]", "`a`");
+            CREATE TABLE t6(a INT primary key, "'a'" INT, """a""" INT, "[a]" INT,  "`a`" INT);
             INSERT INTO t6 VALUES(1,2,3,4,5);
         ]=]
         return test:execsql2 "SELECT * FROM t6"
@@ -537,7 +537,7 @@ test:do_test(
     "colname-7.1",
     function()
         test:execsql [[
-            CREATE TABLE t7(x INTEGER PRIMARY KEY, y);
+            CREATE TABLE t7(x INTEGER PRIMARY KEY, y INT);
             INSERT INTO t7 VALUES(1,2);
         ]]
         return test:execsql2 "SELECT x, * FROM t7"
@@ -597,7 +597,7 @@ for i, val in ipairs(data2) do
     )
 end
 
-test:execsql([[ create table table1("a" primary key, "b") ]])
+test:execsql([[ create table table1("a" TEXT primary key, "b" TEXT) ]])
 test:execsql("insert into table1 values('a1', 'a1')")
 
 -- " is used for identifiers
@@ -636,16 +636,16 @@ test:do_test(
 
 test:do_catchsql_test(
     "colname-11.1",
-    [[ create table t1(a, b, c, primary key('A'))]],
+    [[ create table t1(a INT, b INT, c INT, primary key('A'))]],
     {1, "expressions prohibited in PRIMARY KEY"})
 
 test:do_catchsql_test(
     "colname-11.2",
-    [[CREATE TABLE t1(a, b, c, d, e, 
+    [[CREATE TABLE t1(a INT, b INT, c INT, d INT, e INT,
       PRIMARY KEY(a), UNIQUE('b' COLLATE "unicode_ci" DESC));]],
     {1, "/functional indexes aren't supported in the current version/"})
 
-test:execsql("create table table1(a primary key, b, c)")
+test:execsql("create table table1(a primary key, b INT, c INT)")
 
 test:do_catchsql_test(
     "colname-11.3",
diff --git a/test/sql-tap/distinctagg.test.lua b/test/sql-tap/distinctagg.test.lua
index daee61418..e55c16b54 100755
--- a/test/sql-tap/distinctagg.test.lua
+++ b/test/sql-tap/distinctagg.test.lua
@@ -22,7 +22,7 @@ test:plan(6)
 test:do_execsql_test(
     "distinctagg-1.1",
     [[
-        CREATE TABLE t1(a,b,c primary key);
+        CREATE TABLE t1(a INT,b INT,c INT primary key);
         INSERT INTO t1 VALUES(1,2,3);
         INSERT INTO t1 VALUES(1,3,4);
         INSERT INTO t1 VALUES(1,3,5);
diff --git a/test/sql-tap/drop_all.test.lua b/test/sql-tap/drop_all.test.lua
index b9abe7594..c9fc2b376 100755
--- a/test/sql-tap/drop_all.test.lua
+++ b/test/sql-tap/drop_all.test.lua
@@ -9,7 +9,7 @@ test:do_test(
     prefix.."1.0",
     function()
         for i = 1, N do
-            test:execsql(string.format("create table table%s(a primary key)", i))
+            test:execsql(string.format("create table table%s(a INT primary key)", i))
         end
 
         for i = 1, N do
diff --git a/test/sql-tap/e_expr.test.lua b/test/sql-tap/e_expr.test.lua
index d0f68954f..c5fa2593a 100755
--- a/test/sql-tap/e_expr.test.lua
+++ b/test/sql-tap/e_expr.test.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env tarantool
 test = require("sqltester")
-test:plan(14750)
+test:plan(14749)
 
 --!./tcltestrunner.lua
 -- 2010 July 16
@@ -934,7 +934,7 @@ test:do_execsql_test(
 -- # clause in a table column definition.
 -- #
 -- do_execsql_test e_expr-9.24 {
---   CREATE TABLE t24(a COLLATE NOCASE, b);
+--   CREATE TABLE t24(a TEXT COLLATE NOCASE, b INT);
 --   INSERT INTO t24 VALUES('aaa', 1);
 --   INSERT INTO t24 VALUES('bbb', 2);
 --   INSERT INTO t24 VALUES('ccc', 3);
@@ -1483,7 +1483,7 @@ end
 --   CREATE TABLE dbname.tblname(cname);
 -- }
 test:execsql [[
-    CREATE TABLE tblname(cname PRIMARY KEY);
+    CREATE TABLE tblname(cname INT PRIMARY KEY);
 ]]
 local function glob(args)
     return 1
@@ -3343,7 +3343,7 @@ evalcount = 0
 test:do_execsql_test(
     "e_expr-26.1.1",
     [[
-        CREATE TABLE t2(x PRIMARY KEY, w1, r1, w2, r2, r3);
+        CREATE TABLE t2(x INT PRIMARY KEY, w1 INT, r1 TEXT, w2 INT, r2 TEXT, r3 TEXT);
         INSERT INTO t2 VALUES(1, 1, 'R1', 2, 'R2', 'R3');
         INSERT INTO t2 VALUES(2, 1, 'R1', 2, 'R2', 'R3');
         INSERT INTO t2 VALUES(3, 1, 'R1', 2, 'R2', 'R3');
@@ -3605,7 +3605,7 @@ do_expr_test("e_expr-32.2.4", [[
 test:do_execsql_test(
     "e_expr-34.1",
     [[
-        CREATE TABLE t1(id PRIMARY KEY, a, b);
+        CREATE TABLE t1(id INT PRIMARY KEY, a INT, b INT);
         INSERT INTO t1 VALUES(1, 1, 2);
         INSERT INTO t1 VALUES(2, NULL, 2);
         INSERT INTO t1 VALUES(3, 1, NULL);
@@ -3700,10 +3700,9 @@ test:catchsql "DROP TABLE t22;"
 test:do_execsql_test(
     "e_expr-35.0",
     [[
-        CREATE TABLE t22(a PRIMARY KEY, b);
+        CREATE TABLE t22(a TEXT PRIMARY KEY, b TEXT);
         INSERT INTO t22 VALUES('one', 'two');
         INSERT INTO t22 VALUES('three', NULL);
-        INSERT INTO t22 VALUES(4, 5.0);
     ]], {
         -- <e_expr-35.0>
         
@@ -3719,14 +3718,11 @@ test:do_execsql_test(
 --
 do_expr_test("e_expr-35.1.1", " (SELECT 35)   ", "integer", 35)
 do_expr_test("e_expr-35.1.2", " (SELECT NULL) ", "null", "")
-do_expr_test("e_expr-35.1.3", " (SELECT count(*) FROM t22) ", "integer", 3)
+do_expr_test("e_expr-35.1.3", " (SELECT count(*) FROM t22) ", "integer", 2)
 do_expr_test("e_expr-35.1.4", " (SELECT 4 FROM t22) ", "integer", 4)
 do_expr_test("e_expr-35.1.5", [[ 
   (SELECT b FROM t22 UNION SELECT a+1 FROM t22)
 ]], "null", "")
-do_expr_test("e_expr-35.1.6", [[ 
-  (SELECT a FROM t22 UNION SELECT COALESCE(b, 55) FROM t22 ORDER BY 1)
-]], "integer", 4)
 -- EVIDENCE-OF: R-46899-53765 A SELECT used as a scalar quantity must
 -- return a result set with a single column.
 --
@@ -3759,7 +3755,7 @@ end
 test:do_execsql_test(
     "e_expr-36.3.1",
     [[
-        CREATE TABLE t4(x PRIMARY KEY, y);
+        CREATE TABLE t4(x INT PRIMARY KEY, y TEXT);
         INSERT INTO t4 VALUES(1, 'one');
         INSERT INTO t4 VALUES(2, 'two');
         INSERT INTO t4 VALUES(3, 'three');
diff --git a/test/sql-tap/fkey3.test.lua b/test/sql-tap/fkey3.test.lua
index 82796ba33..39f55d9d9 100755
--- a/test/sql-tap/fkey3.test.lua
+++ b/test/sql-tap/fkey3.test.lua
@@ -107,7 +107,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "fkey3-3.1",
     [[
-        CREATE TABLE t3(a PRIMARY KEY, b, c, d,
+        CREATE TABLE t3(a INT PRIMARY KEY, b INT, c INT, d INT,
             UNIQUE(a, b),
             FOREIGN KEY(c, d) REFERENCES t3(a, b));
         INSERT INTO t3 VALUES(1, 2, 1, 2);
@@ -139,7 +139,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "fkey3-3.4",
     [[
-        CREATE TABLE t4(a PRIMARY KEY, b REFERENCES t4(a));
+        CREATE TABLE t4(a INT PRIMARY KEY, b INT REFERENCES t4(a));
     ]], {
         -- <fkey3-3.4>
         -- </fkey3-3.4>
@@ -158,7 +158,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "fkey3-3.6",
     [[
-        CREATE TABLE t6(a INTEGER PRIMARY KEY, b, c, d,
+        CREATE TABLE t6(a INTEGER PRIMARY KEY, b INT, c INT, d INT,
             FOREIGN KEY(c, d) REFERENCES t6(a, b));
         CREATE UNIQUE INDEX t6i ON t6(b, a);
         INSERT INTO t6 VALUES(1, 'a', 1, 'a');
@@ -206,7 +206,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "fkey3-3.10",
     [[
-        CREATE TABLE t7(a, b, c, d INTEGER PRIMARY KEY,
+        CREATE TABLE t7(a INT, b INT, c INT, d INTEGER PRIMARY KEY,
             FOREIGN KEY(c, d) REFERENCES t7(a, b));
         CREATE UNIQUE INDEX t7i ON t7(a, b);
         INSERT INTO t7 VALUES('x', 1, 'x', 1);
@@ -239,7 +239,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "fkey3-6.1",
     [[
-        CREATE TABLE t8(a PRIMARY KEY, b, c, d, e, FOREIGN KEY(c, d) REFERENCES t8(a, b));
+        CREATE TABLE t8(a INT PRIMARY KEY, b INT, c INT, d INT, e INT, FOREIGN KEY(c, d) REFERENCES t8(a, b));
         CREATE UNIQUE INDEX t8i1 ON t8(a, b);
         CREATE UNIQUE INDEX t8i2 ON t8(c);
         INSERT INTO t8 VALUES(1, 1, 1, 1, 1);
diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua
index fee0ead15..54bf5addf 100755
--- a/test/sql-tap/func.test.lua
+++ b/test/sql-tap/func.test.lua
@@ -38,7 +38,7 @@ test:do_test(
 test:do_execsql_test(
     "func-0.1",
     [[
-        CREATE TABLE t2(id integer primary key, a);
+        CREATE TABLE t2(id integer primary key, a INT);
         INSERT INTO t2(id,a) VALUES(1, 1);
         INSERT INTO t2(id,a) VALUES(2, NULL);
         INSERT INTO t2(id,a) VALUES(3, 345);
@@ -357,7 +357,7 @@ test:do_test(
     "func-4.1",
     function()
         test:execsql([[
-            CREATE TABLE t1(id integer primary key, a,b,c);
+            CREATE TABLE t1(id integer primary key, a INT,b INT,c INT);
             INSERT INTO t1(id, a,b,c) VALUES(1, 1,2,3);
             INSERT INTO t1(id, a,b,c) VALUES(2, 2,1.2345678901234,-12345.67890);
             INSERT INTO t1(id, a,b,c) VALUES(3, 3,-2,-5);
@@ -1201,7 +1201,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-12.5",
     [[
-        CREATE TABLE t4(id integer primary key, x);
+        CREATE TABLE t4(id integer primary key, x INT);
         INSERT INTO t4 VALUES(1, test_destructor('hello'));
         INSERT INTO t4 VALUES(2, test_destructor('world'));
         SELECT min(test_destructor(x)), max(test_destructor(x)) FROM t4;
@@ -1247,7 +1247,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-13.2",
     [[
-        CREATE TABLE t4(id integer primary key, a, b);
+        CREATE TABLE t4(id integer primary key, a INT, b INT);
         INSERT INTO t4 VALUES(1, 'abc', 'def');
         INSERT INTO t4 VALUES(2, 'ghi', 'jkl');
     ]], {
@@ -1452,7 +1452,7 @@ test:do_test(
     "func-16.1",
     function()
         test:execsql([[
-            CREATE TABLE tbl2(id integer primary key, a, b);
+            CREATE TABLE tbl2(id integer primary key, a INT, b INT);
         ]])
         STMT = sqlite3_prepare(DB, "INSERT INTO tbl2 VALUES(1, ?, ?)", -1, "TAIL")
         sqlite3_bind_blob(STMT, 1, "abc", 3)
@@ -1492,7 +1492,7 @@ end
 test:do_execsql_test(
     "func-18.1",
     [[
-        CREATE TABLE t5(id int primary key, x);
+        CREATE TABLE t5(id int primary key, x INT);
         INSERT INTO t5 VALUES(1, 1);
         INSERT INTO t5 VALUES(2, -99);
         INSERT INTO t5 VALUES(3, 10000);
@@ -1571,7 +1571,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-18.10",
     [[
-        CREATE TABLE t6(id primary key, x INTEGER);
+        CREATE TABLE t6(id INT primary key, x INTEGER);
         INSERT INTO t6 VALUES(1, 1);
         INSERT INTO t6 VALUES(2, 1<<62);
         SELECT sum(x) - ((1<<62)+1) from t6;
@@ -2421,7 +2421,7 @@ test:do_test(
     "func-28.1",
     function()
         test:execsql([[
-            CREATE TABLE t28(id primary key, x, y DEFAULT(nosuchfunc(1)));
+            CREATE TABLE t28(id INT primary key, x INT, y INT DEFAULT(nosuchfunc(1)));
         ]])
         return test:catchsql([[
             INSERT INTO t28(id, x) VALUES(1, 1);
@@ -2442,7 +2442,7 @@ test:do_test(
     "func-29.1",
     function()
         test:execsql([[
-            CREATE TABLE t29(id INTEGER PRIMARY KEY, x, y);
+            CREATE TABLE t29(id INTEGER PRIMARY KEY, x INT, y INT);
             INSERT INTO t29 VALUES(1, 2, 3), (2, NULL, 4), (3, 4.5, 5);
             INSERT INTO t29 VALUES(4, randomblob(1000000), 6);
             INSERT INTO t29 VALUES(5, 'hello', 7);
@@ -2525,7 +2525,7 @@ end
 test:do_execsql_test(
     "func-29.10",
     [[
-        CREATE TABLE t29b(a primary key,b,c,d,e,f,g,h,i);
+        CREATE TABLE t29b(a INT primary key,b INT,c INT,d INT,e INT,f INT,g INT,h INT,i INT);
         INSERT INTO t29b 
          VALUES(1, hex(randomblob(2000)), null, 0, 1, '', zeroblob(0),'x',x'01');
         SELECT typeof(c), typeof(d), typeof(e), typeof(f),
diff --git a/test/sql-tap/gh-2360-omit-truncate-in-transaction.test.lua b/test/sql-tap/gh-2360-omit-truncate-in-transaction.test.lua
index 7bd5572a7..aa2989bdc 100755
--- a/test/sql-tap/gh-2360-omit-truncate-in-transaction.test.lua
+++ b/test/sql-tap/gh-2360-omit-truncate-in-transaction.test.lua
@@ -32,7 +32,7 @@ test:do_execsql_test(
 	"truncate-1.3",
 	[[
 		DROP TABLE IF EXISTS t1;
-		CREATE TABLE t1(id PRIMARY KEY, a, b);
+		CREATE TABLE t1(id INT PRIMARY KEY, a INT, b INT);
 		INSERT INTO t1 VALUES(1, 1, 1), (2, 1, 3), (3, 2, 3);
 		DELETE FROM t1;
 		SELECT * FROM t1;
diff --git a/test/sql-tap/gh-2723-concurrency.test.lua b/test/sql-tap/gh-2723-concurrency.test.lua
index 3f7d241c0..92b96c156 100755
--- a/test/sql-tap/gh-2723-concurrency.test.lua
+++ b/test/sql-tap/gh-2723-concurrency.test.lua
@@ -11,7 +11,7 @@ for id = 1, N do
     fiber.create(
         function ()
             local table_name = "table2723"..id
-            box.sql.execute("create table "..table_name.."(id primary key, a integer unique, b)")
+            box.sql.execute("create table "..table_name.."(id primary key, a integer unique, b INT)")
             box.sql.execute("insert into "..table_name.." values(1, 2, 3)")
             box.sql.execute("insert into "..table_name.." values(3, 4, 3)")
             pcall( function() box.sql.execute("insert into "..table_name.." values(3, 4, 3)") end)
@@ -32,7 +32,7 @@ test:do_test(
     0)
 
 ch = fiber.channel(N)
-box.sql.execute("create table t1(id primary key, a integer unique, b);")
+box.sql.execute("create table t1(id primary key, a integer unique, b INT);")
 box.sql.execute("create index i1 on t1(b);")
 for id = 1, N do
     fiber.create(
@@ -59,7 +59,7 @@ box.sql.execute("drop table t1;")
 
 
 ch = fiber.channel(N)
-box.sql.execute("create table t1(id primary key, a integer unique, b);")
+box.sql.execute("create table t1(id primary key, a integer unique, b INT);")
 box.sql.execute("create index i1 on t1(b);")
 for id = 1, N*N do
     box.sql.execute(string.format("insert into t1 values(%s, %s, 3)", id, id))
diff --git a/test/sql-tap/gh-2884-forbid-rowid-syntax.test.lua b/test/sql-tap/gh-2884-forbid-rowid-syntax.test.lua
index 74d69aa17..c628510c2 100755
--- a/test/sql-tap/gh-2884-forbid-rowid-syntax.test.lua
+++ b/test/sql-tap/gh-2884-forbid-rowid-syntax.test.lua
@@ -4,7 +4,7 @@ test:plan(1)
 
 local ok = pcall(test.execsql, test, [[
     DROP TABLE IF EXISTS t1;
-    CREATE TABLE t1(a, b, c, d TEXT, PRIMARY KEY (c, d)) WITHOUT ROWID;
+    CREATE TABLE t1(a INT, b INT, c INT, d TEXT, PRIMARY KEY (c, d)) WITHOUT ROWID;
 ]])
 
 test:ok(not ok, 'rowid syntax must be forbidden')
diff --git a/test/sql-tap/gh-2953-drop-table-with-FK.test.lua b/test/sql-tap/gh-2953-drop-table-with-FK.test.lua
index 43e541d78..9b92af1ae 100755
--- a/test/sql-tap/gh-2953-drop-table-with-FK.test.lua
+++ b/test/sql-tap/gh-2953-drop-table-with-FK.test.lua
@@ -8,8 +8,8 @@ test:do_execsql_test(
 	[[
 		DROP TABLE IF EXISTS t3;
 		DROP TABLE IF EXISTS t2;
-		CREATE TABLE t2(id PRIMARY KEY);
-		CREATE TABLE t3(id PRIMARY KEY REFERENCES t2(id));
+		CREATE TABLE t2(id INT PRIMARY KEY);
+		CREATE TABLE t3(id INT PRIMARY KEY REFERENCES t2(id));
 		INSERT INTO t2 VALUES(1), (2), (3);
 		INSERT INTO t3 VALUES(3);
 	]], {
@@ -100,8 +100,8 @@ test:do_execsql_test(
 test:do_execsql_test(
 	"drop-table-fk-2.1",
 	[[
-		CREATE TABLE t2(id PRIMARY KEY);
-		CREATE TABLE t3(id PRIMARY KEY REFERENCES t2(id) ON DELETE CASCADE);
+		CREATE TABLE t2(id INT PRIMARY KEY);
+		CREATE TABLE t3(id INT PRIMARY KEY REFERENCES t2(id) ON DELETE CASCADE);
 		INSERT INTO t2 VALUES(1), (2), (3);
 		INSERT INTO t3 VALUES(3);
 	]], {
diff --git a/test/sql-tap/gh-2996-indexed-by.test.lua b/test/sql-tap/gh-2996-indexed-by.test.lua
index 2525e46e0..6f59825d9 100755
--- a/test/sql-tap/gh-2996-indexed-by.test.lua
+++ b/test/sql-tap/gh-2996-indexed-by.test.lua
@@ -7,7 +7,7 @@ test:plan(13)
 -- statement is correct.
 
 test:execsql [[
-    CREATE TABLE t1(a INT PRIMARY KEY, b);
+    CREATE TABLE t1(a INT PRIMARY KEY, b INT);
     CREATE INDEX t1ix1 ON t1(b);
     CREATE INDEX t1ix2 on t1(b);
 ]]
diff --git a/test/sql-tap/gh2130-index-refer-table.test.lua b/test/sql-tap/gh2130-index-refer-table.test.lua
index 3a6064cb9..535428861 100755
--- a/test/sql-tap/gh2130-index-refer-table.test.lua
+++ b/test/sql-tap/gh2130-index-refer-table.test.lua
@@ -5,8 +5,8 @@ test:plan(5)
 test:execsql " DROP TABLE IF EXISTS t1 "
 test:execsql " DROP TABLE IF EXISTS t2 "
 
-test:execsql " CREATE TABLE t1(a INT PRIMARY KEY, b, c) "
-test:execsql " CREATE TABLE t2(a INT PRIMARY KEY, b, c) "
+test:execsql " CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT) "
+test:execsql " CREATE TABLE t2(a INT PRIMARY KEY, b INT, c INT) "
 
 test:do_execsql_test(
 	"index-1.1",
diff --git a/test/sql-tap/gh2250-trigger-chain-limit.test.lua b/test/sql-tap/gh2250-trigger-chain-limit.test.lua
index bfbb26097..0239e5053 100755
--- a/test/sql-tap/gh2250-trigger-chain-limit.test.lua
+++ b/test/sql-tap/gh2250-trigger-chain-limit.test.lua
@@ -3,7 +3,7 @@ test = require("sqltester")
 test:plan(8)
 
 for _, table_count in ipairs({30, 31}) do
-    -- Clean up, create tables, add entries
+    -- Clean up, create tables, add INT entries
     for i = 1,table_count do
         -- First table for uniform triggers check
         drop_string = 'DROP TABLE IF EXISTS t' .. i .. ';'
diff --git a/test/sql-tap/icu.test.lua b/test/sql-tap/icu.test.lua
index 1a6b01f96..ad2c75a99 100755
--- a/test/sql-tap/icu.test.lua
+++ b/test/sql-tap/icu.test.lua
@@ -25,7 +25,7 @@ if (0 > 0)
  then
     -- Create a table to work with.
     --
-    test:execsql "CREATE TABLE test1(i1 int primary key, i2 int, r1 real, r2 real, t1 text, t2 text)"
+    test:execsql "CREATE TABLE test1(i1 int primary key, i2 int, r1 INT real, r2 INT real, t1 text, t2 text)"
     test:execsql "INSERT INTO test1 VALUES(1,2,1.1,2.2,'hello','world')"
     local function test_expr(name, settings, expr, result)
         test:do_test(
@@ -87,7 +87,7 @@ if (0 > 0)
     test:do_execsql_test(
         "icu-4.1",
         [[
-            CREATE TABLE fruit(name);
+            CREATE TABLE fruit(name INT);
             INSERT INTO fruit VALUES('plum');
             INSERT INTO fruit VALUES('cherry');
             INSERT INTO fruit VALUES('apricot');
diff --git a/test/sql-tap/identifier-characters.test.lua b/test/sql-tap/identifier-characters.test.lua
index 31b45c6e7..631474c2a 100755
--- a/test/sql-tap/identifier-characters.test.lua
+++ b/test/sql-tap/identifier-characters.test.lua
@@ -14,7 +14,7 @@ local testcases = {
 		if string.len(id) == box.schema.NAME_MAX then
 			id = string.sub(id, string.len(id))
 		end
-		test:execsql(string.format("create table \"%s\" (a primary key);", id))
+		test:execsql(string.format("create table \"%s\" (a INT primary key);", id))
 	end,
 	-- cleanup
 	function (id)
@@ -25,7 +25,7 @@ local testcases = {
 	end},
 	{"column name",
 	function (id)
-		test:execsql(string.format("create table table1(a primary key, \"%s\");", id))
+		test:execsql(string.format("create table table1(a INT primary key, \"%s\" INT);", id))
 	end,
 	function (id)
 		test:execsql(string.format("drop table table1;", id))
@@ -81,7 +81,7 @@ local testcases = {
 
 test:do_execsql_test(
 	test_prefix.."preparition",
-	"create table test(a primary key, b, c)")
+	"create table test(a primary key, b INT, c INT)")
 
 for _, testcase in ipairs(testcases) do
 	test:do_test(
diff --git a/test/sql-tap/identifier_case.test.lua b/test/sql-tap/identifier_case.test.lua
index 3f6dc0725..bbb4330ec 100755
--- a/test/sql-tap/identifier_case.test.lua
+++ b/test/sql-tap/identifier_case.test.lua
@@ -158,7 +158,7 @@ test:do_test(
 
 test:do_execsql_test(
     test_prefix.."4.0",
-    string.format([[create table table1(a, b primary key)]]),
+    string.format([[create table table1(a, b INT primary key)]]),
     nil
 )
 
@@ -213,7 +213,7 @@ data = {
 test:do_catchsql_test(
     test_prefix.."6.0.",
     [[
-        CREATE TABLE T1 (a primary key, b);
+        CREATE TABLE T1 (a INT primary key, b INT);
     ]],
     {0})
 
diff --git a/test/sql-tap/in2.test.lua b/test/sql-tap/in2.test.lua
index a53624e1b..019676391 100755
--- a/test/sql-tap/in2.test.lua
+++ b/test/sql-tap/in2.test.lua
@@ -22,7 +22,7 @@ test:plan(1999)
 test:do_execsql_test(
     "in2-1",
     [[
-        CREATE TABLE a(i INTEGER PRIMARY KEY, a);
+        CREATE TABLE a(i INTEGER PRIMARY KEY, a INT);
     ]], {
         -- <in2-1>
         
diff --git a/test/sql-tap/index7.test.lua b/test/sql-tap/index7.test.lua
index c8f56eb29..128d1cd3e 100755
--- a/test/sql-tap/index7.test.lua
+++ b/test/sql-tap/index7.test.lua
@@ -30,7 +30,7 @@ end
 -- do_test index7-1.1 {
 --   # Able to parse and manage partial indices
 --   execsql {
---     CREATE TABLE t1(a,b,c PRIMARY KEY) WITHOUT rowid;
+--     CREATE TABLE t1(a INT,b INT,c INT PRIMARY KEY) WITHOUT rowid;
 --     CREATE INDEX t1a ON t1(a) WHERE a IS NOT NULL;
 --     CREATE INDEX t1b ON t1(b) WHERE b>10;
 --     CREATE VIRTUAL TABLE nums USING wholenumber;
@@ -146,7 +146,7 @@ end
 -- #
 -- do_test index7-2.1 {
 --   execsql {
---     CREATE TABLE t2(a,b PRIMARY KEY) without rowid;
+--     CREATE TABLE t2(a INT,b INT PRIMARY KEY) without rowid;
 --     INSERT INTO t2(a,b) SELECT value, value FROM nums WHERE value<1000;
 --     UPDATE t2 SET a=NULL WHERE b%5==0;
 --     CREATE INDEX t2a1 ON t2(a) WHERE a IS NOT NULL;
@@ -211,7 +211,7 @@ end
 -- # Partial UNIQUE indices
 -- #
 -- do_execsql_test index7-3.1 {
---   CREATE TABLE t3(a,b PRIMARY KEY) without rowid;
+--   CREATE TABLE t3(a INT,b INT PRIMARY KEY) without rowid;
 --   INSERT INTO t3 SELECT value, value FROM nums WHERE value<200;
 --   UPDATE t3 SET a=999 WHERE b%5!=0;
 --   CREATE UNIQUE INDEX t3a ON t3(a) WHERE a<>999;
@@ -247,8 +247,8 @@ end
 test:do_execsql_test(
     "index7-6.1",
     [[
-        CREATE TABLE t5(id primary key, a, b);
-        CREATE TABLE t4(id primary key, c, d);
+        CREATE TABLE t5(id INT primary key, a INT, b INT);
+        CREATE TABLE t4(id INT primary key, c INT, d INT);
         INSERT INTO t5 VALUES(1, 1, 'xyz');
         INSERT INTO t4 VALUES(1, 'abc', 'not xyz');
         SELECT a,b,c,d FROM (SELECT a,b FROM t5 WHERE a=1 AND b='xyz'), t4 WHERE c='abc';
diff --git a/test/sql-tap/insert1.test.lua b/test/sql-tap/insert1.test.lua
index 847b25ad2..679db7c1a 100755
--- a/test/sql-tap/insert1.test.lua
+++ b/test/sql-tap/insert1.test.lua
@@ -218,7 +218,7 @@ end, {
 -- Test of expressions in the VALUES clause
 --
 test:do_execsql_test("insert-4.1", [[
-  CREATE TABLE t3(a PRIMARY KEY,b,c);
+  CREATE TABLE t3(a INT PRIMARY KEY,b INT,c INT);
   INSERT INTO t3 VALUES(1+2+3,4,5);
   SELECT * FROM t3;
 ]], {
@@ -291,7 +291,7 @@ test:do_execsql_test("insert-4.7", [[
 --
 -- if X(0, "X!capable", [["tempdb"]]) then
   test:do_execsql_test("insert-5.1", [[
-    CREATE TABLE t4(x PRIMARY KEY);
+    CREATE TABLE t4(x INT PRIMARY KEY);
     INSERT INTO t4 VALUES(1);
     SELECT * FROM t4;
   ]], {
@@ -367,7 +367,7 @@ test:do_execsql_test("insert-4.7", [[
   -- The REPLACE command is not available if SQLITE_OMIT_CONFLICT is 
   -- defined at compilation time.
   test:do_execsql_test("insert-6.1", [[
-    CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE);
+    CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT UNIQUE);
     INSERT INTO t1 VALUES(1,2);
     INSERT INTO t1 VALUES(2,3);
     SELECT b FROM t1 WHERE b=2;
@@ -412,7 +412,7 @@ test:do_execsql_test("insert-4.7", [[
 -- # INSERT statments.
 -- do_test insert-7.1 {
 --   execsql {
---     CREATE TABLE t1(a);
+--     CREATE TABLE t1(a INT);
 --     INSERT INTO t1 VALUES(1);
 --     INSERT INTO t1 VALUES(2);
 --     CREATE INDEX i1 ON t1(a);
@@ -444,7 +444,7 @@ test:do_execsql_test("insert-4.7", [[
 -- #
 -- do_test insert-9.1 {
 --   execsql {
---     CREATE TABLE t5(x);
+--     CREATE TABLE t5(x INT);
 --     INSERT INTO t5 VALUES(1);
 --     INSERT INTO t5 VALUES(2);
 --     INSERT INTO t5 VALUES(3);
@@ -455,7 +455,7 @@ test:do_execsql_test("insert-4.7", [[
 -- MUST_WORK_TEST
 -- do_test insert-9.2 {
 --   execsql {
---     CREATE TABLE t6(x INTEGER PRIMARY KEY, y);
+--     CREATE TABLE t6(x INTEGER PRIMARY KEY, y INT);
 --     INSERT INTO t6 VALUES(1,1);
 --     INSERT INTO t6 VALUES(2,2);
 --     INSERT INTO t6 VALUES(3,3);
@@ -467,7 +467,7 @@ test:do_execsql_test("insert-4.7", [[
 --
 -- if X(0, "X!capable", [["compound"]]) then
   test:do_execsql_test("insert-10.1", [[
-    CREATE TABLE t10(a PRIMARY KEY,b,c);
+    CREATE TABLE t10(a PRIMARY KEY,b INT,c INT);
     INSERT INTO t10 VALUES(1,2,3), (4,5,6), (7,8,9);
     SELECT * FROM t10;
   ]], {
@@ -490,7 +490,7 @@ test:do_execsql_test("insert-4.7", [[
 -- #
 -- do_execsql_test insert-11.1 {
 --   CREATE TABLE t11a AS SELECT '123456789' AS x;
---   CREATE TABLE t11b (a INTEGER PRIMARY KEY, b, c);
+--   CREATE TABLE t11b (a INTEGER PRIMARY KEY, b INT, c INT);
 --   INSERT INTO t11b SELECT x, x, x FROM t11a;
 --   SELECT quote(a), quote(b), quote(c) FROM t11b;
 -- } {123456789 '123456789' '123456789'}
@@ -498,9 +498,9 @@ test:do_execsql_test("insert-4.7", [[
 -- # Ticket http://www.sqlite.org/src/info/e9654505cfda9361
 -- #
 -- do_execsql_test insert-12.1 {
---   CREATE TABLE t12a(a,b,c,d,e,f,g);
+--   CREATE TABLE t12a(a INT,b INT,c INT,d INT,e INT,f INT,g INT);
 --   INSERT INTO t12a VALUES(101,102,103,104,105,106,107);
---   CREATE TABLE t12b(x);
+--   CREATE TABLE t12b(x INT);
 --   INSERT INTO t12b(x,rowid,x,x,x,x,x) SELECT * FROM t12a;
 --   SELECT rowid, x FROM t12b;
 -- } {102 101}
@@ -511,7 +511,7 @@ test:do_execsql_test("insert-4.7", [[
 --   SELECT * FROM tab1;
 -- } {11 22}
 -- do_execsql_test insert-12.3 {
---   CREATE TABLE t12c(a, b DEFAULT 'xyzzy', c);
+--   CREATE TABLE t12c(a INT, b INT DEFAULT 'xyzzy', c INT);
 --   INSERT INTO t12c(a, rowid, c) SELECT 'one', 999, 'two';
 --   SELECT * FROM t12c;
 -- } {one xyzzy two}
diff --git a/test/sql-tap/intpkey.test.lua b/test/sql-tap/intpkey.test.lua
index ecff3c0ff..e5769b6dc 100755
--- a/test/sql-tap/intpkey.test.lua
+++ b/test/sql-tap/intpkey.test.lua
@@ -27,7 +27,7 @@ test:plan(39)
 test:do_execsql_test(
     "intpkey-1.0",
     [[
-        CREATE TABLE t1(a TEXT PRIMARY KEY, b, c);
+        CREATE TABLE t1(a TEXT PRIMARY KEY, b INT, c INT);
     ]], {
         -- <intpkey-1.0>
         
@@ -53,7 +53,7 @@ test:do_execsql_test(
     "intpkey-1.2",
     [[
         DROP TABLE t1;
-        CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+        CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT, c INT);
         --SELECT name FROM sqlite_master
         --  WHERE type='index' AND tbl_name='t1';
     ]], {
@@ -660,7 +660,7 @@ if (0 > 0) then
 test:do_execsql_test(
     "intpkey-8.1",
     [[
-        CREATE TABLE t2(x INTEGER PRIMARY KEY, y, z);
+        CREATE TABLE t2(x INTEGER PRIMARY KEY, y INT, z INT);
         INSERT INTO t2 SELECT * FROM t1;
         --SELECT rowid FROM t2;
         SELECT x FROM t2;
@@ -701,7 +701,7 @@ if (0 > 0)
         "intpkey-10.1",
         [[
             DROP TABLE t2;
-            CREATE TABLE t2(x INTEGER PRIMARY KEY, y, z);
+            CREATE TABLE t2(x INTEGER PRIMARY KEY, y INT, z INT);
             INSERT INTO t2 VALUES(NULL, 1, 2);
             SELECT * from t2;
         ]], {
diff --git a/test/sql-tap/join.test.lua b/test/sql-tap/join.test.lua
index 074a29380..220554b58 100755
--- a/test/sql-tap/join.test.lua
+++ b/test/sql-tap/join.test.lua
@@ -24,7 +24,7 @@ test:plan(92)
 test:do_execsql_test(
     "join-1.1",
     [[
-        CREATE TABLE t1(a primary key,b,c);
+        CREATE TABLE t1(a INT primary key,b INT,c INT);
         INSERT INTO t1 VALUES(1,2,3);
         INSERT INTO t1 VALUES(2,3,4);
         INSERT INTO t1 VALUES(3,4,5);
@@ -38,7 +38,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join-1.2",
     [[
-        CREATE TABLE t2(b primary key,c,d);
+        CREATE TABLE t2(b INT primary key,c INT,d INT);
         INSERT INTO t2 VALUES(1,2,3);
         INSERT INTO t2 VALUES(2,3,4);
         INSERT INTO t2 VALUES(3,4,5);
@@ -348,7 +348,7 @@ test:do_execsql2_test(
 test:do_execsql_test(
     "join-1.15",
     [[
-        CREATE TABLE t3(c primary key,d,e);
+        CREATE TABLE t3(c INT primary key,d INT,e INT);
         INSERT INTO t3 VALUES(2,3,4);
         INSERT INTO t3 VALUES(3,4,5);
         INSERT INTO t3 VALUES(4,5,6);
@@ -382,7 +382,7 @@ test:do_execsql2_test(
 test:do_execsql_test(
     "join-1.18",
     [[
-        CREATE TABLE t4(d primary key,e,f);
+        CREATE TABLE t4(d INT primary key,e INT,f INT);
         INSERT INTO t4 VALUES(2,3,4);
         INSERT INTO t4 VALUES(3,4,5);
         INSERT INTO t4 VALUES(4,5,6);
@@ -708,8 +708,8 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "join-5.1",
     [[
-        create table centros (id integer primary key, centro);
-        create table usuarios (id integer primary key, nombre, apellidos,
+        create table centros (id integer primary key, centro TEXT);
+        create table usuarios (id integer primary key, nombre TEXT, apellidos INT,
         idcentro integer);
         BEGIN;
         INSERT INTO centros VALUES(1,'xxx');
@@ -733,7 +733,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join-7.1",
     [[
-        CREATE TABLE t7 (id primary key, x, y);
+        CREATE TABLE t7 (id INT primary key, x TEXT, y INT);
         INSERT INTO t7 VALUES (1, 'pa1', 1);
         INSERT INTO t7 VALUES (2, 'pa2', NULL);
         INSERT INTO t7 VALUES (3, 'pa3', NULL);
@@ -742,7 +742,7 @@ test:do_execsql_test(
         INSERT INTO t7 VALUES (6, 'pa31', 130);
         INSERT INTO t7 VALUES (7, 'pa28', NULL);
 
-        CREATE TABLE t8 (a integer primary key, b);
+        CREATE TABLE t8 (a integer primary key, b TEXT);
         INSERT INTO t8 VALUES (1, 'pa1');
         INSERT INTO t8 VALUES (2, 'pa4');
         INSERT INTO t8 VALUES (3, NULL);
@@ -765,13 +765,13 @@ test:do_execsql_test(
 -- do_test join-8.1 {
 --   execsql {
 --     BEGIN;
---     CREATE TABLE t9(a INTEGER PRIMARY KEY, b);
+--     CREATE TABLE t9(a INTEGER PRIMARY KEY, b INT);
 --     INSERT INTO t9 VALUES(1,11);
 --     INSERT INTO t9 VALUES(2,22);
---     CREATE TABLE t10(x INTEGER PRIMARY KEY, y);
+--     CREATE TABLE t10(x INTEGER PRIMARY KEY, y INT);
 --     INSERT INTO t10 VALUES(1,2);
 --     INSERT INTO t10 VALUES(3,3);    
---     CREATE TABLE t11(p INTEGER PRIMARY KEY, q);
+--     CREATE TABLE t11(p INTEGER PRIMARY KEY, q INT);
 --     INSERT INTO t11 VALUES(2,111);
 --     INSERT INTO t11 VALUES(3,333);    
 --     CREATE VIEW v10_11 AS SELECT x, q FROM t10, t11 WHERE t10.y=t11.p;
@@ -816,8 +816,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join-9.1",
     [[
-        CREATE TABLE t12(a primary key,b);
-        CREATE TABLE t13(b primary key,c);
+        CREATE TABLE t12(a INT primary key,b INT);
+        CREATE TABLE t13(b INT primary key,c INT);
         BEGIN;
         INSERT INTO t12 VALUES(1,11);
         INSERT INTO t12 VALUES(2,22);
@@ -863,8 +863,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join-10.1",
     [[
-        CREATE TABLE t21(a primary key,b,c);
-        CREATE TABLE t22(p primary key,q);
+        CREATE TABLE t21(a INT primary key,b INT,c INT);
+        CREATE TABLE t22(p INT primary key,q INT);
         CREATE INDEX i22 ON t22(q);
         SELECT a FROM t21 LEFT JOIN t22 ON b=p WHERE q=
            (SELECT max(m.q) FROM t22 m JOIN t21 n ON n.b=m.p WHERE n.c=1);
@@ -881,8 +881,8 @@ test:do_test(
     "join-10.2",
     function()
         test:execsql [[
-            CREATE TABLE t23(a primary key, b, c);
-            CREATE TABLE t24(a primary key, b, c);
+            CREATE TABLE t23(a INT primary key, b INT, c INT);
+            CREATE TABLE t24(a INT primary key, b INT, c INT);
             INSERT INTO t23 VALUES(1, 2, 3);
         ]]
         return test:execsql [[
@@ -980,8 +980,8 @@ test:do_test(
             DROP TABLE IF EXISTS t2;
         ]]
         return test:execsql [[
-            CREATE TABLE t1(id primary key, a COLLATE "unicode_ci", b);
-            CREATE TABLE t2(id primary key, a, b);
+            CREATE TABLE t1(id INT primary key, a TEXT COLLATE "unicode_ci", b INT);
+            CREATE TABLE t2(id INT primary key, a TEXT, b INT);
             INSERT INTO t1 VALUES(1, 'ONE', 1);
             INSERT INTO t1 VALUES(2, 'two', 2);
             INSERT INTO t2 VALUES(1, 'one', 1);
@@ -1015,8 +1015,8 @@ test:do_test(
             DROP TABLE IF EXISTS t2;
         ]]
         return test:execsql [[
-            CREATE TABLE t1(a primary key, b TEXT);
-            CREATE TABLE t2(b INTEGER primary key, a);
+            CREATE TABLE t1(a TEXT primary key, b TEXT);
+            CREATE TABLE t2(b INTEGER primary key, a TEXT);
             INSERT INTO t1 VALUES('one', '1.0');
             INSERT INTO t1 VALUES('two', '2');
             INSERT INTO t2 VALUES(1, 'one');
@@ -1054,7 +1054,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join-12.1",
     [[
-        CREATE TABLE t14(x primary key);
+        CREATE TABLE t14(x TEXT primary key);
         INSERT INTO t14 VALUES('abcdefghij');
     ]])
 
@@ -1092,9 +1092,9 @@ jointest("join-12.13", 65537, {1, 'too many references to "T14": max 65535'})
 test:do_execsql_test(
     "join-13.0",
     [[
-        CREATE TABLE aa(a primary key);
-        CREATE TABLE bb(b primary key);
-        CREATE TABLE cc(id primary key, c);
+        CREATE TABLE aa(a INT primary key);
+        CREATE TABLE bb(b INT primary key);
+        CREATE TABLE cc(id INT primary key, c INT);
 
         INSERT INTO aa VALUES(45);
         INSERT INTO cc VALUES(1, 45);
diff --git a/test/sql-tap/join2.test.lua b/test/sql-tap/join2.test.lua
index c89331afc..c8b17bd7e 100755
--- a/test/sql-tap/join2.test.lua
+++ b/test/sql-tap/join2.test.lua
@@ -23,7 +23,7 @@ test:plan(7)
 test:do_execsql_test(
     "join2-1.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1,11);
         INSERT INTO t1 VALUES(2,22);
         INSERT INTO t1 VALUES(3,33);
@@ -37,7 +37,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join2-1.2",
     [[
-        CREATE TABLE t2(b primary key,c);
+        CREATE TABLE t2(b INT primary key,c INT);
         INSERT INTO t2 VALUES(11,111);
         INSERT INTO t2 VALUES(33,333);
         INSERT INTO t2 VALUES(44,444);
@@ -51,7 +51,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "join2-1.3",
     [[
-        CREATE TABLE t3(c primary key,d);
+        CREATE TABLE t3(c INT primary key,d INT);
         INSERT INTO t3 VALUES(111,1111);
         INSERT INTO t3 VALUES(444,4444);
         INSERT INTO t3 VALUES(555,5555);
diff --git a/test/sql-tap/join6.test.lua b/test/sql-tap/join6.test.lua
index 27480b723..896f61960 100755
--- a/test/sql-tap/join6.test.lua
+++ b/test/sql-tap/join6.test.lua
@@ -28,9 +28,9 @@ test:plan(14)
 test:do_execsql_test(
     "join6-1.1",
     [[
-        CREATE TABLE t1(a primary key);
-        CREATE TABLE t2(a primary key);
-        CREATE TABLE t3(a primary key,b);
+        CREATE TABLE t1(a INT primary key);
+        CREATE TABLE t2(a INT primary key);
+        CREATE TABLE t3(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1);
         INSERT INTO t3 VALUES(1,2);
 
@@ -70,9 +70,9 @@ test:do_execsql_test(
         DROP TABLE t2;
         DROP TABLE t3;
 
-        CREATE TABLE t1(x primary key,y);
-        CREATE TABLE t2(y primary key,z);
-        CREATE TABLE t3(x primary key,z);
+        CREATE TABLE t1(x INT primary key,y INT);
+        CREATE TABLE t2(y INT primary key,z INT);
+        CREATE TABLE t3(x INT primary key,z INT);
 
         INSERT INTO t1 VALUES(1,2);
         INSERT INTO t1 VALUES(3,4);
@@ -107,15 +107,15 @@ test:do_execsql_test(
         DROP TABLE t2;
         DROP TABLE t3;
 
-        CREATE TABLE t1(a primary key,x,y);
+        CREATE TABLE t1(a INT primary key,x INT,y INT);
         INSERT INTO t1 VALUES(1,91,92);
         INSERT INTO t1 VALUES(2,93,94);
 
-        CREATE TABLE t2(b primary key,y,z);
+        CREATE TABLE t2(b INT primary key,y INT,z INT);
         INSERT INTO t2 VALUES(3,92,93);
         INSERT INTO t2 VALUES(4,94,95);
 
-        CREATE TABLE t3(c primary key,x,z);
+        CREATE TABLE t3(c INT primary key,x INT,z INT);
         INSERT INTO t3 VALUES(5,91,93);
         INSERT INTO t3 VALUES(6,99,95);
 
diff --git a/test/sql-tap/keyword1.test.lua b/test/sql-tap/keyword1.test.lua
index 23a561f4d..31de3de6d 100755
--- a/test/sql-tap/keyword1.test.lua
+++ b/test/sql-tap/keyword1.test.lua
@@ -20,7 +20,7 @@ test:plan(176)
 -- ["set","testdir",[["file","dirname",["argv0"]]]]
 -- ["source",[["testdir"],"\/tester.tcl"]]
 test:execsql [[
-    CREATE TABLE t1(a PRIMARY KEY, b);
+    CREATE TABLE t1(a INT PRIMARY KEY, b INT);
     INSERT INTO t1 VALUES(1, 'one');
     INSERT INTO t1 VALUES(2, 'two');
     INSERT INTO t1 VALUES(3, 'three');
diff --git a/test/sql-tap/like3.test.lua b/test/sql-tap/like3.test.lua
index 505d2fabb..77a13b8a3 100755
--- a/test/sql-tap/like3.test.lua
+++ b/test/sql-tap/like3.test.lua
@@ -35,7 +35,7 @@ test:plan(7)
 
 test:execsql([[
     --PRAGMA encoding='UTF8';
-    CREATE TABLE t1(a PRIMARY KEY,b TEXT COLLATE "unicode_ci");
+    CREATE TABLE t1(a INT PRIMARY KEY,b TEXT COLLATE "unicode_ci");
     INSERT INTO t1(a,b)
        VALUES(1,'abc'),
              (2,'ABX'),
@@ -70,7 +70,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "like3-2.0",
     [[
-        CREATE TABLE t2(a PRIMARY KEY, b TEXT);
+        CREATE TABLE t2(a INT PRIMARY KEY, b TEXT);
         INSERT INTO t2 SELECT a, b FROM t1;
         CREATE INDEX t2ba ON t2(b,a);
         SELECT a, b FROM t2 WHERE b GLOB 'ab*' ORDER BY +a;
diff --git a/test/sql-tap/limit.test.lua b/test/sql-tap/limit.test.lua
index 4e2af8f1c..b166d2362 100755
--- a/test/sql-tap/limit.test.lua
+++ b/test/sql-tap/limit.test.lua
@@ -23,7 +23,7 @@ test:plan(103)
 -- Build some test data
 --
 test:execsql [[
-    CREATE TABLE t1(id primary key, x int, y int);
+    CREATE TABLE t1(id INT primary key, x int, y int);
     BEGIN;
 ]]
 for i=1,32 do
@@ -233,7 +233,7 @@ test:do_test(
     "limit-4.1",
     function()
         return test:execsql [[
-            CREATE TABLE t3(x primary KEY);
+            CREATE TABLE t3(x INT primary KEY);
             BEGIN;
             INSERT INTO t3 SELECT x FROM t1 ORDER BY x LIMIT 10 OFFSET 1;
             INSERT INTO t3 SELECT x+(SELECT max(x) FROM t3) FROM t3;
@@ -282,7 +282,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "limit-5.1",
     [[
-        CREATE TABLE t5(id primary key, x, y);
+        CREATE TABLE t5(id INT primary key, x INT, y INT);
         INSERT INTO t5 SELECT id, x-y, x+y FROM t1 WHERE x BETWEEN 10 AND 15
             ORDER BY x LIMIT 2;
         SELECT x, y FROM t5 ORDER BY x;
@@ -346,7 +346,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "limit-6.1",
     [[
-        CREATE TABLE t6(a primary key);
+        CREATE TABLE t6(a INT primary key);
         BEGIN;
         INSERT INTO t6 VALUES(1);
         INSERT INTO t6 VALUES(2);
@@ -568,7 +568,7 @@ test:do_execsql_test(
     "limit-9.2.1",
     [[
         --CREATE TABLE t7 AS SELECT * FROM t6;
-        CREATE TABLE t7 (a primary key);
+        CREATE TABLE t7 (a INT primary key);
         INSERT INTO t7 SELECT * FROM t6;
     ]], {
         -- <limit-9.2.1>
@@ -757,7 +757,7 @@ test:do_test(
     "limit-13.1",
     function()
         return test:execsql [[
-            CREATE TABLE t13(x primary key);
+            CREATE TABLE t13(x INT primary key);
             INSERT INTO t13 VALUES(1),(2);
             CREATE VIEW v13a AS SELECT x AS y FROM t13;
             CREATE VIEW v13b AS SELECT y AS z FROM v13a UNION ALL SELECT y+10 FROM v13a;
diff --git a/test/sql-tap/minmax4.test.lua b/test/sql-tap/minmax4.test.lua
index d17ce8dfd..b600c9bfe 100755
--- a/test/sql-tap/minmax4.test.lua
+++ b/test/sql-tap/minmax4.test.lua
@@ -29,7 +29,7 @@ test:do_test(
     "minmax4-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(p primary key,q);
+            CREATE TABLE t1(p INT primary key,q INT);
             SELECT p, max(q) FROM t1;
         ]]
     end, {
@@ -217,7 +217,7 @@ test:do_test(
     "minmax4-2.1",
     function()
         return test:execsql [[
-            CREATE TABLE t2(a,b,c primary key);
+            CREATE TABLE t2(a INT,b INT,c INT primary key);
             INSERT INTO t2 VALUES
                  (1,null,2),
                  (1,2,3),
diff --git a/test/sql-tap/offset1.test.lua b/test/sql-tap/offset1.test.lua
index e7554ef78..0cbd3df57 100755
--- a/test/sql-tap/offset1.test.lua
+++ b/test/sql-tap/offset1.test.lua
@@ -25,9 +25,9 @@ test:plan(22)
 test:do_execsql_test(
     "offset1-1.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
-        CREATE TABLE t2(id primary key, x,y);
+        CREATE TABLE t2(id INT primary key, x INT,y INT);
         INSERT INTO t2 VALUES(1, 8,'y'),(2, 9,'z'),(3, 6,'w'),(4, 7,'x');
         SELECT count(*) FROM t1, t2;
     ]], {
diff --git a/test/sql-tap/orderby1.test.lua b/test/sql-tap/orderby1.test.lua
index e216df2ca..31af3e0f4 100755
--- a/test/sql-tap/orderby1.test.lua
+++ b/test/sql-tap/orderby1.test.lua
@@ -728,7 +728,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     6.0,
     [[
-        CREATE TABLE abc(a primary key, b, c);
+        CREATE TABLE abc(a INT primary key, b INT, c INT);
         INSERT INTO abc VALUES(1, 2, 3);
         INSERT INTO abc VALUES(4, 5, 6);
         INSERT INTO abc VALUES(7, 8, 9);
@@ -751,7 +751,7 @@ test:do_execsql_test(
 -- # routine in where.c.
 -- #
 -- do_execsql_test 7.0 {
---   CREATE TABLE t7(a,b);
+--   CREATE TABLE t7(a INT,b INT);
 --   CREATE INDEX t7a ON t7(a);
 --   CREATE INDEX t7ab ON t7(a,b);
 --   EXPLAIN QUERY PLAN
@@ -767,7 +767,7 @@ test:do_execsql_test(
 --     8.0,
 --     [[
 --         PRAGMA cache_size = 5;
---         CREATE TABLE t1(id integer primary key, a, b);
+--         CREATE TABLE t1(id integer primary key, a INT, b INT);
 --         CREATE INDEX i1 ON t1(a);
 --     ]])
 
diff --git a/test/sql-tap/orderby4.test.lua b/test/sql-tap/orderby4.test.lua
index fb8d3ecc6..a07857d3a 100755
--- a/test/sql-tap/orderby4.test.lua
+++ b/test/sql-tap/orderby4.test.lua
@@ -28,9 +28,9 @@ testprefix = "orderby4"
 test:do_execsql_test(
     "1.1",
     [[
-        CREATE TABLE t1(a, b, PRIMARY KEY(a,b));
+        CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a,b));
         INSERT INTO t1 VALUES(1,1),(1,2);
-        CREATE TABLE t2(x, y, PRIMARY KEY(x,y));
+        CREATE TABLE t2(x INT, y INT, PRIMARY KEY(x,y));
         INSERT INTO t2 VALUES(3,3),(4,4);
         SELECT a, x FROM t1, t2 ORDER BY 1, 2;
     ]], {
@@ -62,10 +62,10 @@ test:do_execsql_test(
 test:do_execsql_test(
     "2.1",
     [[
-        CREATE TABLE t3(id primary key, a);
+        CREATE TABLE t3(id INT primary key, a INT);
         INSERT INTO t3 VALUES(1, 1),(2, 1);
         CREATE INDEX t3a ON t3(a);
-        CREATE TABLE t4(id primary key, x);
+        CREATE TABLE t4(id INT primary key, x INT);
         INSERT INTO t4 VALUES(1, 3),(2, 4);
         CREATE INDEX t4x ON t4(x);
         SELECT a, x FROM t3, t4 ORDER BY 1, 2;
diff --git a/test/sql-tap/orderby5.test.lua b/test/sql-tap/orderby5.test.lua
index 2a7f71949..d133d86eb 100755
--- a/test/sql-tap/orderby5.test.lua
+++ b/test/sql-tap/orderby5.test.lua
@@ -26,7 +26,7 @@ testprefix = "orderby5"
 test:do_execsql_test(
     1.1,
     [[
-        CREATE TABLE t1(id primary key,a,b,c);
+        CREATE TABLE t1(id INT primary key,a INT,b INT,c INT);
         CREATE INDEX t1bc ON t1(b,c);
 
         EXPLAIN QUERY PLAN
@@ -142,7 +142,7 @@ test:do_execsql_test(
 -- # lookups.
 -- #
 -- do_execsql_test 2.1a {
---   CREATE TABLE t2(a,b,c);
+--   CREATE TABLE t2(a INT,b INT,c INT);
 --   CREATE INDEX t2bc ON t2(b,c);
 --   ANALYZE;
 --   INSERT INTO sqlite_stat1 VALUES('t1','t1bc','1000000 10 9');
@@ -182,7 +182,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     3.0,
     [[
-        CREATE TABLE t3(a INTEGER PRIMARY KEY, b, c, d, e, f);
+        CREATE TABLE t3(a INTEGER PRIMARY KEY, b INT, c INT, d INT, e INT, f INT);
         --CREATE INDEX t3bcde ON t3(b, c, d, e);
         -- As pk is not necessary in Tarantool's secondary indexes 'a' should be added manually
         CREATE INDEX t3bcde ON t3(b, c, d, e, a);
@@ -197,7 +197,7 @@ test:do_execsql_test(
 -- MUST_WORK_TEST
 -- do_execsql_test 3.1 {
 --   DROP TABLE t3;
---   CREATE TABLE t3(a INTEGER PRIMARY KEY, b, c, d, e, f);
+--   CREATE TABLE t3(a INTEGER PRIMARY KEY, b INT, c INT, d INT, e INT, f INT);
 --   CREATE INDEX t3bcde ON t3(b, c, d, e);
 --   EXPLAIN QUERY PLAN
 --   SELECT a FROM t3 WHERE b=2 AND c=3 ORDER BY d DESC, e DESC, b, c, a DESC;
diff --git a/test/sql-tap/orderby8.test.lua b/test/sql-tap/orderby8.test.lua
index 1651cd9e5..63ec6da1c 100755
--- a/test/sql-tap/orderby8.test.lua
+++ b/test/sql-tap/orderby8.test.lua
@@ -29,7 +29,7 @@ test:do_test(
     1.0,
     function()
         test:execsql [[
-            CREATE TABLE t1(x primary key);
+            CREATE TABLE t1(x INT primary key);
             INSERT INTO t1(x) VALUES(1),(5),(9),(7),(3),(2),(4),(6),(8);
         ]]
         rs = "x"
diff --git a/test/sql-tap/printf2.test.lua b/test/sql-tap/printf2.test.lua
index bc76d241b..7ffee422a 100755
--- a/test/sql-tap/printf2.test.lua
+++ b/test/sql-tap/printf2.test.lua
@@ -174,7 +174,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "printf2-2.1",
     [[
-        CREATE TABLE t1(id primary key, a,b,c);
+        CREATE TABLE t1(id INT primary key, a INT,b INT,c INT);
         INSERT INTO t1 VALUES(1, 1,2,3);
         INSERT INTO t1 VALUES(2, -1,-2,-3);
         INSERT INTO t1 VALUES(3, 'abc','def','ghi');
diff --git a/test/sql-tap/select4.test.lua b/test/sql-tap/select4.test.lua
index 5f91b137e..a5c704d0c 100755
--- a/test/sql-tap/select4.test.lua
+++ b/test/sql-tap/select4.test.lua
@@ -711,7 +711,7 @@ INSERT INTO t2 VALUES (0, 1), (1, 1), (2, 2), (3, 4), (4, 8), (5, 15);]]
 -- #
 -- do_test select4-7.1 {
 --   execsql {
---     CREATE TABLE t2 AS SELECT log AS 'x', count(*) AS 'y' FROM t1 GROUP BY log;
+--     CREATE TABLE t2 AS SELECT log AS 'x', count INT (*) AS 'y' FROM t1 GROUP BY log;
 --     SELECT * FROM t2 ORDER BY x;
 --   }
 -- } {0 1 1 1 2 2 3 4 4 8 5 15}  
@@ -1045,7 +1045,7 @@ test:do_execsql_test(
     })
 
 test:execsql [[DROP TABLE IF EXISTS t2;
-CREATE TABLE t2 (rowid int primary key, x, y);]]
+CREATE TABLE t2 (rowid int primary key, x INT, y INT);]]
 -- Make sure compound SELECTs with wildly different numbers of columns
 -- do not cause assertion faults due to register allocation issues.
 --
@@ -1261,7 +1261,7 @@ test:do_test(
     "select4-13.1",
     function()
         return test:execsql [[
-            CREATE TABLE t13(id int primary key,a,b);
+            CREATE TABLE t13(id int primary key,a INT,b INT);
             INSERT INTO t13 VALUES(0, 1,1);
             INSERT INTO t13 VALUES(1, 2,1);
             INSERT INTO t13 VALUES(2, 3,1);
@@ -1282,7 +1282,7 @@ test:do_test(
 test:do_execsql_test(
     "select4-14.1",
     [[
-        CREATE TABLE t14(a primary key,b,c);
+        CREATE TABLE t14(a INT primary key,b INT,c INT);
         INSERT INTO t14 VALUES(1,2,3),(4,5,6);
         SELECT * FROM t14 INTERSECT VALUES(3,2,1),(2,3,1),(1,2,3),(2,1,3);
     ]], {
diff --git a/test/sql-tap/select5.test.lua b/test/sql-tap/select5.test.lua
index 97cf3f980..9e2f8c7b5 100755
--- a/test/sql-tap/select5.test.lua
+++ b/test/sql-tap/select5.test.lua
@@ -206,7 +206,7 @@ test:do_execsql_test(
     "select5-5.1",
     [[
         DROP TABLE IF EXISTS t2;
-        CREATE TABLE t2(id int primary key, a, b, c);
+        CREATE TABLE t2(id int primary key, a INT, b INT, c INT);
         INSERT INTO t2 VALUES(0, 1, 2, 3);
         INSERT INTO t2 VALUES(1, 1, 4, 5);
         INSERT INTO t2 VALUES(2, 6, 4, 7);
@@ -276,7 +276,7 @@ test:do_execsql_test(
     "select5-6.1",
     [[
         DROP TABLE IF EXISTS t3;
-        CREATE TABLE t3(x primary key,y);
+        CREATE TABLE t3(x INT primary key,y INT);
         INSERT INTO t3 VALUES(1,NULL);
         INSERT INTO t3 VALUES(2,NULL);
         INSERT INTO t3 VALUES(3,4);
@@ -291,7 +291,7 @@ test:do_execsql_test(
     "select5-6.2",
     [[
         DROP TABLE IF EXISTS t4;
-        CREATE TABLE t4(id int primary key, x,y,z);
+        CREATE TABLE t4(id int primary key, x INT,y INT,z INT);
         INSERT INTO t4 VALUES(0,1,2,NULL);
         INSERT INTO t4 VALUES(1,2,3,NULL);
         INSERT INTO t4 VALUES(2,3,NULL,5);
@@ -324,8 +324,8 @@ test:do_execsql_test(
     [[
         DROP TABLE IF EXISTS t8a;
         DROP TABLE IF EXISTS t8b;
-        CREATE TABLE t8a(id int primary key,a,b);
-        CREATE TABLE t8b(rowid int primary key, x);
+        CREATE TABLE t8a(id int primary key,a INT,b INT);
+        CREATE TABLE t8b(rowid int primary key, x INT);
         INSERT INTO t8a VALUES(0, 'one', 1);
         INSERT INTO t8a VALUES(1, 'one', 2);
         INSERT INTO t8a VALUES(2, 'two', 3);
diff --git a/test/sql-tap/select8.test.lua b/test/sql-tap/select8.test.lua
index 9d075f697..6e34cc32c 100755
--- a/test/sql-tap/select8.test.lua
+++ b/test/sql-tap/select8.test.lua
@@ -23,7 +23,7 @@ test:plan(3)
 -- ["source",[["testdir"],"\/tester.tcl"]]
 test:execsql [[
     DROP TABLE IF EXISTS songs;
-    CREATE TABLE songs(songid primary key, artist, timesplayed);
+    CREATE TABLE songs(songid INT primary key, artist INT, timesplayed INT);
     INSERT INTO songs VALUES(1,'one',1);
     INSERT INTO songs VALUES(2,'one',2);
     INSERT INTO songs VALUES(3,'two',3);
diff --git a/test/sql-tap/select9.test.lua b/test/sql-tap/select9.test.lua
index e85308c0a..eb719d264 100755
--- a/test/sql-tap/select9.test.lua
+++ b/test/sql-tap/select9.test.lua
@@ -136,8 +136,8 @@ test:do_execsql_test(
     [[
         DROP TABLE IF EXISTS t1;
         DROP TABLE IF EXISTS t2;
-        CREATE TABLE t1(id primary key, a, b, c);
-        CREATE TABLE t2(id primary key, d, e, f);
+        CREATE TABLE t1(id INT primary key, a INT, b INT, c INT);
+        CREATE TABLE t2(id INT primary key, d INT, e INT, f INT);
         BEGIN;
           INSERT INTO t1 VALUES(0, 1,  'one',   'I');
           INSERT INTO t1 VALUES(1, 3,  NULL,    NULL);
@@ -484,8 +484,8 @@ test:do_test(
     "select9-5.1",
     function()
         return test:execsql [[
-            CREATE TABLE t51(x primary key, y);
-            CREATE TABLE t52(x primary key, y);
+            CREATE TABLE t51(x INT primary key, y INT);
+            CREATE TABLE t52(x INT primary key, y INT);
             CREATE VIEW v5 as
                SELECT x, y FROM t51
                UNION ALL
@@ -536,8 +536,8 @@ test:do_execsql_test(
     [[
         DROP TABLE IF EXISTS t61;
         DROP TABLE IF EXISTS t62;
-        CREATE TABLE t61(a primary key);
-        CREATE TABLE t62(b primary key);
+        CREATE TABLE t61(a INT primary key);
+        CREATE TABLE t62(b INT primary key);
         INSERT INTO t61 VALUES(111);
         INSERT INTO t62 VALUES(222);
         SELECT a FROM t61 WHERE 0 UNION SELECT b FROM t62;
diff --git a/test/sql-tap/selectF.test.lua b/test/sql-tap/selectF.test.lua
index 0222ee21a..af703b0e5 100755
--- a/test/sql-tap/selectF.test.lua
+++ b/test/sql-tap/selectF.test.lua
@@ -24,8 +24,8 @@ testprefix = "selectF"
 test:do_execsql_test(
     1,
     [[
-        CREATE TABLE t1(a primary key, b, c);
-        CREATE TABLE t2(d primary key, e, f);
+        CREATE TABLE t1(a INT primary key, b INT, c INT);
+        CREATE TABLE t2(d INT primary key, e INT, f INT);
         BEGIN TRANSACTION;
         INSERT INTO t1 VALUES(1,'one','I');
         INSERT INTO t2 VALUES(5,'ten','XX');
diff --git a/test/sql-tap/selectG.test.lua b/test/sql-tap/selectG.test.lua
index f9732658e..701dbf9b3 100755
--- a/test/sql-tap/selectG.test.lua
+++ b/test/sql-tap/selectG.test.lua
@@ -30,7 +30,7 @@ testprefix = "selectG"
 test:do_test(
     100,
     function()
-        local sql_arr = {[[CREATE TABLE t1(x primary key);
+        local sql_arr = {[[CREATE TABLE t1(x INT primary key);
             INSERT INTO t1(x) VALUES]]}
         local i
         for i = 1, 100000-1, 1 do
diff --git a/test/sql-tap/table.test.lua b/test/sql-tap/table.test.lua
index 6e1056193..a4a40747b 100755
--- a/test/sql-tap/table.test.lua
+++ b/test/sql-tap/table.test.lua
@@ -128,7 +128,7 @@ test:do_test(
     "table-2.1",
     function()
         test:execsql "CREATE TABLE TEST2(one text primary key)"
-        return test:catchsql "CREATE TABLE test2(id primary key, two text default 'hi')"
+        return test:catchsql "CREATE TABLE test2(id INT primary key, two text default 'hi')"
     end, {
         -- <table-2.1>
         1, "table TEST2 already exists"
@@ -148,7 +148,7 @@ test:do_test(
 test:do_catchsql_test(
     "table-2.1d",
     [[
-        CREATE TABLE IF NOT EXISTS test2(x primary key,y)
+        CREATE TABLE IF NOT EXISTS test2(x primary key,y INT)
     ]], {
         -- <table-2.1d>
         0
@@ -180,9 +180,9 @@ test:do_execsql_test(
 test:do_test(
     "table-2.2a",
     function()
-        test:execsql "CREATE TABLE test2(id primary key, one text)"
+        test:execsql "CREATE TABLE test2(id INT primary key, one text)"
         return test:execsql "CREATE INDEX test3 ON test2(one)"
-        --catchsql {CREATE TABLE test3(id primary key, two text)}
+        --catchsql {CREATE TABLE test3(id INT primary key, two text)}
     end, {
         -- <table-2.2a>
         
@@ -263,7 +263,7 @@ test:do_test(
 test:do_catchsql_test(
     "table-3.2",
     [[
-        CREATE TABLE BIG(xyz foo primary key)
+        CREATE TABLE BIG(xyz INT foo primary key)
     ]], {
         -- <table-3.2>
         1, "table BIG already exists"
@@ -273,7 +273,7 @@ test:do_catchsql_test(
 test:do_catchsql_test(
     "table-3.3",
     [[
-        CREATE TABLE biG(xyz foo primary key)
+        CREATE TABLE biG(xyz INT foo primary key)
     ]], {
         -- <table-3.3>
         1, "table BIG already exists"
@@ -283,7 +283,7 @@ test:do_catchsql_test(
 test:do_catchsql_test(
     "table-3.4",
     [[
-        CREATE TABLE bIg(xyz foo primary key)
+        CREATE TABLE bIg(xyz INT foo primary key)
     ]], {
         -- <table-3.4>
         1, "table BIG already exists"
@@ -293,7 +293,7 @@ test:do_catchsql_test(
 -- do_test table-3.5 {
 --   db close
 --   sqlite3 db test.db
---   set v [catch {execsql {CREATE TABLE Big(xyz foo)}} msg]
+--   set v [catch {execsql {CREATE TABLE Big(xyz INT foo)}} msg]
 --   lappend v $msg
 -- } {1 {table Big already exists}}
 test:do_test(
@@ -317,7 +317,7 @@ test:do_test(
     "table-4.1",
     function()
         for i = 1, 100, 1 do
-            local sql = "CREATE TABLE "..string.format("test%03d", i).." (id primary key, "
+            local INT sql = "CREATE TABLE "..string.format("test%03d", i).." (id INT primary key,  "
             for k = 1, i-1, 1 do
                 sql = sql .. "field"..k.." text,"
             end
@@ -426,11 +426,11 @@ if (0 > 0)
             forcedelete("test.db")
             sqlite3("db", "test.db")
             return test:execsql [[
-                CREATE TABLE t0(a,b);
+                CREATE TABLE t0(a,b INT);
                 CREATE INDEX t ON t0(a);
-                UPDATE sqlite_master SET sql='CREATE TABLE a.b(a UNIQUE';
+                UPDATE sqlite_master SET sql='CREATE TABLE a.b(a INT UNIQUE';
                 --BEGIN;
-                --CREATE TABLE t1(x);
+                --CREATE TABLE t1(x INT);
                 --ROLLBACK;
                 DROP TABLE IF EXISTS t99;
             ]]
@@ -528,7 +528,7 @@ test:do_execsql2_test(
 test:do_execsql_test(
     "table-7.3",
     [[
-        CREATE TABLE savepoint_t(release_t primary key);
+        CREATE TABLE savepoint_t(release_t INT primary key);
         INSERT INTO savepoint_t(release_t) VALUES(10);
         UPDATE savepoint_t SET release_t = 5;
         SELECT release_t FROM savepoint_t;
@@ -577,25 +577,25 @@ test:do_execsql2_test(
 -- )}}
 -- do_test table-8.2 {
 --   execsql {
---     CREATE TABLE "t3""xyz"(a,b,c);
+--     CREATE TABLE "t3""xyz"(a INT,b INT,c INT);
 --     INSERT INTO [t3"xyz] VALUES(1,2,3);
 --     SELECT * FROM [t3"xyz];
 --   }
 -- } {1 2 3}
 -- do_test table-8.3 {
 --   execsql2 {
---     CREATE TABLE [t4"abc] AS SELECT count(*) as cnt, max(b+c) FROM [t3"xyz];
+--     CREATE TABLE [t4"abc] AS SELECT count(*) as cnt, max (b+c) FROM [t3"xyz];
 --     SELECT * FROM [t4"abc];
 --   }
 -- } {cnt 1 max(b+c) 5}
 -- # Update for v3: The declaration type of anything except a column is now a
 -- # NULL pointer, so the created table has no column types. (Changed result
--- # from {{CREATE TABLE 't4"abc'(cnt NUMERIC,"max(b+c)" NUMERIC)}}).
+-- # from {{CREATE TABLE 't4"abc'(cnt NUMERIC, "max(b+c)" NUMERIC)}}).
 -- do_test table-8.3.1 {
 --   execsql {
 --     SELECT sql FROM sqlite_master WHERE name='t4"abc'
 --   }
--- } {{CREATE TABLE "t4""abc"(cnt,"max(b+c)")}}
+-- } {{CREATE TABLE "t4""abc"(cnt, "max(b+c)")}}
 -- ifcapable tempdb {
 --   do_test table-8.4 {
 --     execsql2 {
@@ -671,7 +671,7 @@ test:do_catchsql_test(
 test:do_catchsql_test(
     "table-9.1",
     [[
-        CREATE TABLE t6(a primary key,b,a);
+        CREATE TABLE t6(a INT primary key,b INT,a INT);
     ]], {
         -- <table-9.1>
         1, "duplicate column name: A"
@@ -694,8 +694,8 @@ test:do_catchsql_test(
     "table-10.1",
     [[
         -- there is no t4 table
-        --CREATE TABLE t6(a REFERENCES t4(a) NOT NULL primary key);
-        CREATE TABLE t6(a REFERENCES t2(id) NOT NULL primary key);
+        --CREATE TABLE t6(a INT REFERENCES t4(a) NOT NULL primary key);
+        CREATE TABLE t6(a INT REFERENCES t2(id) NOT NULL primary key);
         INSERT INTO t6 VALUES(NULL);
     ]], {
         -- <table-10.1>
@@ -707,7 +707,7 @@ test:do_catchsql_test(
     "table-10.2",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a REFERENCES t4(a) MATCH PARTIAL primary key);
+        CREATE TABLE t6(a INT REFERENCES t4(a) MATCH PARTIAL primary key);
     ]], {
         -- <table-10.2>
         0
@@ -718,7 +718,7 @@ test:do_catchsql_test(
     "table-10.3",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a REFERENCES t4 MATCH FULL ON DELETE SET NULL NOT NULL primary key);
+        CREATE TABLE t6(a INT REFERENCES t4 MATCH FULL ON DELETE SET NULL NOT NULL primary key);
     ]], {
         -- <table-10.3>
         0
@@ -729,7 +729,7 @@ test:do_catchsql_test(
     "table-10.4",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a REFERENCES t4 MATCH FULL ON UPDATE SET DEFAULT DEFAULT 1 primary key);
+        CREATE TABLE t6(a INT REFERENCES t4 MATCH FULL ON UPDATE SET DEFAULT DEFAULT 1 primary key);
     ]], {
         -- <table-10.4>
         0
@@ -740,7 +740,7 @@ test:do_catchsql_test(
     "table-10.5",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a NOT NULL NOT DEFERRABLE INITIALLY IMMEDIATE primary key);
+        CREATE TABLE t6(a INT NOT NULL NOT DEFERRABLE INITIALLY IMMEDIATE primary key);
     ]], {
         -- <table-10.5>
         0
@@ -751,7 +751,7 @@ test:do_catchsql_test(
     "table-10.6",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a NOT NULL DEFERRABLE INITIALLY DEFERRED primary key);
+        CREATE TABLE t6(a INT NOT NULL DEFERRABLE INITIALLY DEFERRED primary key);
     ]], {
         -- <table-10.6>
         0
@@ -762,7 +762,7 @@ test:do_catchsql_test(
     "table-10.7",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a primary key,
+        CREATE TABLE t6(a INT primary key,
           FOREIGN KEY (a) REFERENCES t4(b) DEFERRABLE INITIALLY DEFERRED
         );
     ]], {
@@ -775,7 +775,7 @@ test:do_catchsql_test(
     "table-10.8",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a primary key,b,c,
+        CREATE TABLE t6(a INT primary key,b INT,c INT,
           FOREIGN KEY (b,c) REFERENCES t4(x,y) MATCH PARTIAL
             ON UPDATE SET NULL ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
         );
@@ -789,7 +789,7 @@ test:do_catchsql_test(
     "table-10.9",
     [[
         DROP TABLE t6;
-        CREATE TABLE t6(a primary key,b,c,
+        CREATE TABLE t6(a INT primary key,b INT,c INT,
           FOREIGN KEY (b,c) REFERENCES t4(x)
         );
     ]], {
@@ -803,7 +803,7 @@ test:do_test(
     function()
         test:catchsql "DROP TABLE t6"
         return test:catchsql [[
-            CREATE TABLE t6(a primary key,b,c,
+            CREATE TABLE t6(a INT primary key,b INT,c INT,
               FOREIGN KEY (b,c) REFERENCES t4(x,y,z)
             );
         ]]
@@ -818,7 +818,7 @@ test:do_test(
     function()
         test:catchsql "DROP TABLE t6"
         return test:catchsql [[
-            CREATE TABLE t6(a,b, c REFERENCES t4(x,y));
+            CREATE TABLE t6(a INT,b INT, c INT REFERENCES t4(x,y));
         ]]
     end, {
         -- <table-10.11>
@@ -831,7 +831,7 @@ test:do_test(
     function()
         test:catchsql "DROP TABLE t6"
         return test:catchsql [[
-            CREATE TABLE t6(a,b,c,
+            CREATE TABLE t6(a INT,b INT,c INT,
               FOREIGN KEY (b,x) REFERENCES t4(x,y)
             );
         ]]
@@ -846,7 +846,7 @@ test:do_test(
     function()
         test:catchsql "DROP TABLE t6"
         return test:catchsql [[
-            CREATE TABLE t6(a,b,c,
+            CREATE TABLE t6(a INT,b INT,c INT,
               FOREIGN KEY (x,b) REFERENCES t4(x,y)
             );
         ]]
@@ -895,16 +895,16 @@ test:do_execsql_test(
         -- </table-11.2>
     })
 
--- # Test that when creating a table using CREATE TABLE AS, column types are
+-- # Test that when creating a table using CREATE TABLE AS, column INT types are
 -- # assigned correctly for (SELECT ...) and 'x AS y' expressions.
 -- do_test table-12.1 {
 --   ifcapable subquery {
 --     execsql {
---       CREATE TABLE t8 AS SELECT b, h, a as i, (SELECT f FROM t7) as j FROM t7;
+--       CREATE TABLE t8 AS SELECT b, h INT, a INT as i, (SELECT f FROM t7) as j FROM t7;
 --     }
 --   } else {
 --     execsql {
---       CREATE TABLE t8 AS SELECT b, h, a as i, f as j FROM t7;
+--       CREATE TABLE t8 AS SELECT b, h INT, a INT as i, f INT as j FROM t7;
 --     }
 --   }
 -- } {}
@@ -912,7 +912,7 @@ test:do_execsql_test(
 --   execsql {
 --     SELECT sql FROM sqlite_master WHERE tbl_name = 't8'
 --   }
--- } {{CREATE TABLE t8(b NUM,h,i INT,j)}}
+-- } {{CREATE TABLE t8(b INT NUM,h INT,i INT,j INT)}}
 ----------------------------------------------------------------------
 -- Test cases table-13.*
 --
@@ -980,7 +980,7 @@ test:do_test(
     function()
         local rc = pcall(function()
             test:execsql("SELECT * FROM tablet8 LIMIT 1")
-            test:execsql("CREATE TABLE t9(a primary key, b, c)")
+            test:execsql("CREATE TABLE t9(a INT primary key, b INT, c INT)")
             end)
         rc = rc == true and 0 or 1
         return { rc }
@@ -1034,7 +1034,7 @@ end
 --       ATTACH 'test2.db' as aux;
 --     }
 --     db eval {SELECT * FROM tablet8 LIMIT 1} {} {
---       db eval {CREATE TABLE aux.t1(a, b, c)}
+--       db eval {CREATE TABLE aux.t1(a, b INT, c INT)}
 --     }
 --   } {}
 --   # On the other hand, it should be impossible to drop a table when any VMs 
@@ -1062,7 +1062,7 @@ test:do_test(
     function()
         --test:execsql "BEGIN"
         for i = 0, 2000-1, 1 do
-            test:execsql("CREATE TABLE tbl"..i.." (a primary key, b, c)")
+            test:execsql("CREATE TABLE tbl"..i.." (a primary key, b INT, c INT)")
         end
         --return test:execsql "COMMIT"
         return
@@ -1090,7 +1090,7 @@ test:do_test(
 -- # Ticket 3a88d85f36704eebe134f7f48aebf00cd6438c1a (2014-08-05)
 -- # The following SQL script segfaults while running the INSERT statement:
 -- #
--- #    CREATE TABLE t1(x DEFAULT(max(1)));
+-- #    CREATE TABLE t1(x INT DEFAULT(max(1)));
 -- #    INSERT INTO t1(rowid) VALUES(1);
 -- #
 -- # The problem appears to be the use of an aggregate function as part of
@@ -1099,7 +1099,7 @@ test:do_test(
 -- # and reported on the sqlite-users@sqlite.org mailing list by Zsbán Ambrus. 
 -- #
 -- do_execsql_test table-16.1 {
---   CREATE TABLE t16(x DEFAULT(max(1)));
+--   CREATE TABLE t16(x INT DEFAULT(max(1)));
 --   INSERT INTO t16(x) VALUES(123);
 --   SELECT rowid, x FROM t16;
 -- } {1 123}
@@ -1108,25 +1108,25 @@ test:do_test(
 -- } {1 {unknown function: max()}}
 -- do_execsql_test table-16.3 {
 --   DROP TABLE t16;
---   CREATE TABLE t16(x DEFAULT(abs(1)));
+--   CREATE TABLE t16(x INT DEFAULT(abs(1)));
 --   INSERT INTO t16(rowid) VALUES(4);
 --   SELECT rowid, x FROM t16;
 -- } {4 1}
 -- do_catchsql_test table-16.4 {
 --   DROP TABLE t16;
---   CREATE TABLE t16(x DEFAULT(avg(1)));
+--   CREATE TABLE t16(x INT DEFAULT(avg(1)));
 --   INSERT INTO t16(rowid) VALUES(123);
 --   SELECT rowid, x FROM t16;
 -- } {1 {unknown function: avg()}}
 -- do_catchsql_test table-16.5 {
 --   DROP TABLE t16;
---   CREATE TABLE t16(x DEFAULT(count()));
+--   CREATE TABLE t16(x INT DEFAULT(count()));
 --   INSERT INTO t16(rowid) VALUES(123);
 --   SELECT rowid, x FROM t16;
 -- } {1 {unknown function: count()}}
 -- do_catchsql_test table-16.6 {
 --   DROP TABLE t16;
---   CREATE TABLE t16(x DEFAULT(group_concat('x',',')));
+--   CREATE TABLE t16(x INT DEFAULT(group_concat('x',',')));
 --   INSERT INTO t16(rowid) VALUES(123);
 --   SELECT rowid, x FROM t16;
 -- } {1 {unknown function: group_concat()}}
@@ -1182,7 +1182,7 @@ test:do_test(
             table.insert(columns, "c"..i)
         end
         columns = table.concat(columns, ",")
-        test:execsql("CREATE TABLE t(c primary key, "..columns..")")
+        test:execsql("CREATE TABLE t(c INT primary key, "..columns..")")
         return
     end, {
     -- <table-15.1>
diff --git a/test/sql-tap/tkt-02a8e81d44.test.lua b/test/sql-tap/tkt-02a8e81d44.test.lua
index 746222ef9..792a5527c 100755
--- a/test/sql-tap/tkt-02a8e81d44.test.lua
+++ b/test/sql-tap/tkt-02a8e81d44.test.lua
@@ -25,7 +25,7 @@ test:plan(1)
 test:do_execsql_test(
     "tkt-02a838-1.1",
     [[
-        CREATE TABLE t1(a primary key);
+        CREATE TABLE t1(a INT primary key);
         INSERT INTO t1 VALUES(1);
         INSERT INTO t1 VALUES(2);
         INSERT INTO t1 VALUES(4);
diff --git a/test/sql-tap/tkt-385a5b56b9.test.lua b/test/sql-tap/tkt-385a5b56b9.test.lua
index 4f5ea91ca..6e863c73f 100755
--- a/test/sql-tap/tkt-385a5b56b9.test.lua
+++ b/test/sql-tap/tkt-385a5b56b9.test.lua
@@ -21,7 +21,7 @@ testprefix = "tkt-385a5b56b9"
 test:do_execsql_test(
     1.0,
     [[
-        CREATE TABLE t1(id primary key, x, y);
+        CREATE TABLE t1(id INT primary key, x INT, y INT);
         INSERT INTO t1 VALUES(1, 1, NULL);
         INSERT INTO t1 VALUES(2, 2, NULL);
         INSERT INTO t1 VALUES(3, 1, NULL);
@@ -57,7 +57,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     2.0,
     [[
-        CREATE TABLE t2(x primary key, y NOT NULL);
+        CREATE TABLE t2(x INT primary key, y INT NOT NULL);
         CREATE UNIQUE INDEX t2x ON t2(x);
         CREATE UNIQUE INDEX t2y ON t2(y);
     ]])
diff --git a/test/sql-tap/tkt-4c86b126f2.test.lua b/test/sql-tap/tkt-4c86b126f2.test.lua
index 529bcc9c4..41afbc462 100755
--- a/test/sql-tap/tkt-4c86b126f2.test.lua
+++ b/test/sql-tap/tkt-4c86b126f2.test.lua
@@ -51,7 +51,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "tkt-4c86b126f2-2.1",
     [[
-        CREATE TABLE t1(x TEXT PRIMARY KEY, y TEXT UNIQUE, z);
+        CREATE TABLE t1(x TEXT PRIMARY KEY, y TEXT UNIQUE, z INT);
         INSERT INTO t1 VALUES('ghi','jkl','y');
         SELECT * FROM t1 WHERE (x='ghi' OR y='jkl') AND z IS NOT NULL;
     ]], {
diff --git a/test/sql-tap/tkt-4dd95f6943.test.lua b/test/sql-tap/tkt-4dd95f6943.test.lua
index 016551c5b..88047d104 100755
--- a/test/sql-tap/tkt-4dd95f6943.test.lua
+++ b/test/sql-tap/tkt-4dd95f6943.test.lua
@@ -21,7 +21,7 @@ testprefix = "tkt-4dd95f6943"
 test:do_execsql_test(
     1.0,
     [[
-        CREATE TABLE t1(id primary key, x);
+        CREATE TABLE t1(id INT primary key, x INT);
         INSERT INTO t1 VALUES (1, 3), (2, 4), (3, 2), (4, 1), (5, 5), (6, 6);
     ]])
 
@@ -62,7 +62,7 @@ end
 test:do_execsql_test(
     2.0,
     [[
-        CREATE TABLE t2(id primary key, x, y);
+        CREATE TABLE t2(id INT primary key, x INT, y INT);
         INSERT INTO t2 VALUES (1, 5, 3), (2, 5, 4), (3, 5, 2), (4, 5, 1), (5, 5, 5), (6, 5, 6);
         INSERT INTO t2 VALUES (7, 1, 3), (8, 1, 4), (9, 1, 2), (10, 1, 1), (11, 1, 5), (12, 1, 6);
         INSERT INTO t2 VALUES (13, 3, 3), (14, 3, 4), (15, 3, 2), (16, 3, 1), (17, 3, 5), (18, 3, 6);
@@ -70,7 +70,7 @@ test:do_execsql_test(
         INSERT INTO t2 VALUES (25, 4, 3), (26, 4, 4), (27, 4, 2), (28, 4, 1), (29, 4, 5), (30, 4, 6);
         INSERT INTO t2 VALUES (31, 6, 3), (32, 6, 4), (33, 6, 2), (34, 6, 1), (35, 6, 5), (36, 6, 6);
 
-        CREATE TABLE t3(a primary key, b);
+        CREATE TABLE t3(a INT primary key, b INT);
         INSERT INTO t3 VALUES (2, 2), (4, 4), (5, 5);
         CREATE UNIQUE INDEX t3i1 ON t3(a ASC);
         CREATE UNIQUE INDEX t3i2 ON t3(b DESC);
@@ -214,11 +214,11 @@ end
 test:do_execsql_test(
     3.0,
     [[
-        CREATE TABLE t7(x primary key);
+        CREATE TABLE t7(x INT primary key);
         INSERT INTO t7 VALUES (1), (2), (3);
         CREATE INDEX i7 ON t7(x);
 
-        CREATE TABLE t8(y primary key);
+        CREATE TABLE t8(y INT primary key);
         INSERT INTO t8 VALUES (1), (2), (3);
     ]])
 
diff --git a/test/sql-tap/tkt-54844eea3f.test.lua b/test/sql-tap/tkt-54844eea3f.test.lua
index be088eaa7..9042652b4 100755
--- a/test/sql-tap/tkt-54844eea3f.test.lua
+++ b/test/sql-tap/tkt-54844eea3f.test.lua
@@ -61,7 +61,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "1.2",
     [[
-        CREATE TABLE t4(id primary key, a, b, c);
+        CREATE TABLE t4(id INT primary key, a INT, b INT, c INT);
         INSERT INTO t4 VALUES(1, 'a', 1, 'one');
         INSERT INTO t4 VALUES(2, 'a', 2, 'two');
         INSERT INTO t4 VALUES(3, 'b', 1, 'three');
diff --git a/test/sql-tap/tkt-8c63ff0ec.test.lua b/test/sql-tap/tkt-8c63ff0ec.test.lua
index a52356a07..8e49db57d 100755
--- a/test/sql-tap/tkt-8c63ff0ec.test.lua
+++ b/test/sql-tap/tkt-8c63ff0ec.test.lua
@@ -24,11 +24,11 @@ testprefix = "tkt-8c63ff0ec"
 test:do_execsql_test(
     1.1,
     [[
-        CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c, d, e);
+        CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT, c INT, d INT, e INT);
         INSERT INTO t1 VALUES(1,20,30,40,50),(3,60,70,80,90);
         CREATE TABLE t2(x INTEGER PRIMARY KEY);
         INSERT INTO t2 VALUES(2);
-        CREATE TABLE t3(id primary key, z);
+        CREATE TABLE t3(id INT primary key, z INT);
         INSERT INTO t3 VALUES(1, 2),(2, 2),(3, 2),(4, 2);
 
         SELECT a, b+c FROM t1
diff --git a/test/sql-tap/tkt-a7b7803e.test.lua b/test/sql-tap/tkt-a7b7803e.test.lua
index 37c2c006a..9eccf362e 100755
--- a/test/sql-tap/tkt-a7b7803e.test.lua
+++ b/test/sql-tap/tkt-a7b7803e.test.lua
@@ -25,7 +25,7 @@ test:do_test(
     "tkt-a7b7803e.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(a primary key,b);
+            CREATE TABLE t1(a INT primary key,b INT);
             INSERT INTO t1 VALUES(0,'first'),(99,'fuzzy');
             SELECT (t1.a==0) AS x, b
               FROM t1
diff --git a/test/sql-tap/tkt-b75a9ca6b0.test.lua b/test/sql-tap/tkt-b75a9ca6b0.test.lua
index 5950892b7..0f61f0de5 100755
--- a/test/sql-tap/tkt-b75a9ca6b0.test.lua
+++ b/test/sql-tap/tkt-b75a9ca6b0.test.lua
@@ -27,7 +27,7 @@ testprefix = "tkt-b75a9ca6b0"
 test:do_execsql_test(
     1,
     [[
-        CREATE TABLE t1 (id primary key, x, y);
+        CREATE TABLE t1 (id INT primary key, x INT, y INT);
         INSERT INTO t1 VALUES (1, 1, 3);
         INSERT INTO t1 VALUES (2, 2, 2);
         INSERT INTO t1 VALUES (3, 3, 1);
diff --git a/test/sql-tap/tkt-f973c7ac31.test.lua b/test/sql-tap/tkt-f973c7ac31.test.lua
index 8179f96e2..e846c2aad 100755
--- a/test/sql-tap/tkt-f973c7ac31.test.lua
+++ b/test/sql-tap/tkt-f973c7ac31.test.lua
@@ -20,7 +20,7 @@ test:plan(21)
 test:do_execsql_test(
     "tkt-f973c7ac3-1.0",
     [[
-        CREATE TABLE t(id primary key, c1 INTEGER, c2 INTEGER);
+        CREATE TABLE t(id INT primary key, c1 INTEGER, c2 INTEGER);
         INSERT INTO t VALUES(1, 5, 5);
         INSERT INTO t VALUES(2, 5, 4);
     ]], {
diff --git a/test/sql-tap/tkt-fa7bf5ec.test.lua b/test/sql-tap/tkt-fa7bf5ec.test.lua
index cafc7ce98..abeb0a3bd 100755
--- a/test/sql-tap/tkt-fa7bf5ec.test.lua
+++ b/test/sql-tap/tkt-fa7bf5ec.test.lua
@@ -30,7 +30,7 @@ test:plan(1)
 test:do_execsql_test(
     "tkt-fa7bf5ec-1",
     [[
-        CREATE TABLE t1(id primary key, x);
+        CREATE TABLE t1(id INT primary key, x INT);
         INSERT INTO t1 VALUES (1, 'a');
         INSERT INTO t1 VALUES (2, 'A');
         INSERT INTO t1 VALUES (3, 'A');
diff --git a/test/sql-tap/tkt1473.test.lua b/test/sql-tap/tkt1473.test.lua
index c9b53b1fc..b5d33c1f6 100755
--- a/test/sql-tap/tkt1473.test.lua
+++ b/test/sql-tap/tkt1473.test.lua
@@ -25,7 +25,7 @@ test:plan(57)
 test:do_execsql_test(
     "tkt1473-1.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1,2);
         INSERT INTO t1 VALUES(3,4);
         SELECT * FROM t1
@@ -290,7 +290,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "tkt1473-4.1",
     [[
-        CREATE TABLE t2(x primary key,y);
+        CREATE TABLE t2(x INT primary key,y INT);
         INSERT INTO t2 VALUES(1,2);
         INSERT INTO t2 SELECT x+2, y+2 FROM t2;
         INSERT INTO t2 SELECT x+4, y+4 FROM t2;
diff --git a/test/sql-tap/tkt1501.test.lua b/test/sql-tap/tkt1501.test.lua
index 3e1ed1e0d..23b0a798d 100755
--- a/test/sql-tap/tkt1501.test.lua
+++ b/test/sql-tap/tkt1501.test.lua
@@ -25,7 +25,7 @@ test:plan(1)
 test:do_execsql_test(
     "tkt1501-1.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1,2);
         SELECT a, b, 'abc' FROM t1
           UNION
diff --git a/test/sql-tap/tkt1514.test.lua b/test/sql-tap/tkt1514.test.lua
index 025c1065f..83b8891e6 100755
--- a/test/sql-tap/tkt1514.test.lua
+++ b/test/sql-tap/tkt1514.test.lua
@@ -23,7 +23,7 @@ test:plan(1)
 test:do_catchsql_test(
     "tkt1514-1.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         SELECT a FROM t1 WHERE max(b)<10 GROUP BY a;
     ]], {
         -- <tkt1514-1.1>
diff --git a/test/sql-tap/tkt1537.test.lua b/test/sql-tap/tkt1537.test.lua
index caa428409..8a53932c9 100755
--- a/test/sql-tap/tkt1537.test.lua
+++ b/test/sql-tap/tkt1537.test.lua
@@ -23,10 +23,10 @@ test:plan(15)
 test:do_execsql_test(
     "tkt1537-1.1",
     [[
-        CREATE TABLE t1(id primary key, a1, a2);
+        CREATE TABLE t1(id INT primary key, a1 INT, a2 INT);
         INSERT INTO t1 VALUES(1, NULL, NULL);
         INSERT INTO t1 VALUES(2, 1, 3);
-        CREATE TABLE t2(id primary key, b);
+        CREATE TABLE t2(id INT primary key, b INT);
         INSERT INTO t2 VALUES(3, 1);
         INSERT INTO t2 VALUES(4, NULL);
         SELECT * FROM t1 LEFT JOIN t2 ON a1=b OR a2=+b;
diff --git a/test/sql-tap/tkt2832.test.lua b/test/sql-tap/tkt2832.test.lua
index 95cd1b5c2..108c05cdb 100755
--- a/test/sql-tap/tkt2832.test.lua
+++ b/test/sql-tap/tkt2832.test.lua
@@ -25,7 +25,7 @@ test:plan(6)
 test:do_execsql_test(
     "tkt2832-1.1",
     [[
-        CREATE TABLE t1(a PRIMARY KEY);
+        CREATE TABLE t1(a INT PRIMARY KEY);
         INSERT INTO t1 VALUES(2);
         INSERT INTO t1 VALUES(1);
         INSERT INTO t1 VALUES(3);
@@ -50,7 +50,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "tkt2832-2.1",
     [[
-        CREATE TABLE t2(a primary key, b);
+        CREATE TABLE t2(a INT primary key, b INT);
         CREATE TRIGGER t2_t AFTER UPDATE ON t2 BEGIN
           DELETE FROM t2 WHERE a = new.a + 1;
         END;
@@ -75,7 +75,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "tkt2832-3.1",
     [[
-        CREATE TABLE t3(a primary key, b);
+        CREATE TABLE t3(a INT primary key, b INT);
         CREATE TRIGGER t3_t AFTER DELETE ON t3 BEGIN
           DELETE FROM t3 WHERE a = old.a + 1;
         END;
diff --git a/test/sql-tap/tkt3424.test.lua b/test/sql-tap/tkt3424.test.lua
index 370677fb9..2bbd226b3 100755
--- a/test/sql-tap/tkt3424.test.lua
+++ b/test/sql-tap/tkt3424.test.lua
@@ -25,7 +25,7 @@ test:do_execsql_test(
         INSERT INTO names VALUES(1,'E1','AAA');
         INSERT INTO names VALUES(2,NULL,'BBB');
 
-        CREATE TABLE orig(id primary key, code TEXT, data TEXT);
+        CREATE TABLE orig(id INT primary key, code TEXT, data TEXT);
         INSERT INTO orig VALUES(1, 'AAA','E1');
         INSERT INTO orig VALUES(2, 'AAA','E2');
         INSERT INTO orig VALUES(3, 'AAA','E3');
diff --git a/test/sql-tap/tkt3541.test.lua b/test/sql-tap/tkt3541.test.lua
index c1cc5e7c8..00f40faaa 100755
--- a/test/sql-tap/tkt3541.test.lua
+++ b/test/sql-tap/tkt3541.test.lua
@@ -25,7 +25,7 @@ test:do_test(
     "tkt3541-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(x primary key);
+            CREATE TABLE t1(x INT primary key);
             INSERT INTO t1 VALUES(123);
             SELECT CASE ~max(x) WHEN min(x) THEN 1 ELSE max(x) END FROM t1;
         ]]
diff --git a/test/sql-tap/tkt3581.test.lua b/test/sql-tap/tkt3581.test.lua
index b90ac9503..4479b8abb 100755
--- a/test/sql-tap/tkt3581.test.lua
+++ b/test/sql-tap/tkt3581.test.lua
@@ -25,10 +25,10 @@ test:do_test(
     "tkt3581-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
+            CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT, c INT);
             INSERT INTO t1 VALUES(0,544,846);
             INSERT INTO t1 VALUES(1,345,51);
-            CREATE TABLE t2(a INTEGER PRIMARY KEY, b, c);
+            CREATE TABLE t2(a INTEGER PRIMARY KEY, b INT, c INT);
             INSERT INTO t2 SELECT * FROM t1;
             CREATE INDEX i2 on t2(c);
         ]]
diff --git a/test/sql-tap/tkt3773.test.lua b/test/sql-tap/tkt3773.test.lua
index 24ab2e7aa..04b991755 100755
--- a/test/sql-tap/tkt3773.test.lua
+++ b/test/sql-tap/tkt3773.test.lua
@@ -27,10 +27,10 @@ test:do_test(
     "tkt3773-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(a primary key,b);
+            CREATE TABLE t1(a INT primary key,b INT);
             INSERT INTO t1 VALUES(2,1);
             INSERT INTO t1 VALUES(33,3);
-            CREATE TABLE t2(x,y primary key);
+            CREATE TABLE t2(x INT,y INT primary key);
             INSERT INTO t2 VALUES(123,2);
             INSERT INTO t2 VALUES(4,4);
             SELECT a FROM (
diff --git a/test/sql-tap/tkt3911.test.lua b/test/sql-tap/tkt3911.test.lua
index 9600c49ef..7169bad77 100755
--- a/test/sql-tap/tkt3911.test.lua
+++ b/test/sql-tap/tkt3911.test.lua
@@ -22,11 +22,11 @@ test:plan(5)
 test:do_execsql_test(
     "tkt3911.1",
     [[
-        CREATE TABLE t1(a primary key,b);
+        CREATE TABLE t1(a INT primary key,b INT);
         INSERT INTO t1 VALUES(1,2);
         INSERT INTO t1 VALUES(11,12);
 
-        CREATE TABLE t2(b primary key,c);
+        CREATE TABLE t2(b INT primary key,c INT);
         INSERT INTO t2 VALUES(2,3);
         INSERT INTO t2 VALUES(22,23);
 
@@ -65,7 +65,7 @@ test:do_test(
     "tkt3911.4",
     function()
         return test:execsql [[
-            CREATE TABLE t3(m,a primary key);
+            CREATE TABLE t3(m INT,a INT primary key);
             INSERT INTO t3 VALUES('one',1);
             INSERT INTO t3 VALUES('two',2);
 
diff --git a/test/sql-tap/tkt3935.test.lua b/test/sql-tap/tkt3935.test.lua
index 4e5e677dc..196656442 100755
--- a/test/sql-tap/tkt3935.test.lua
+++ b/test/sql-tap/tkt3935.test.lua
@@ -23,8 +23,8 @@ test:plan(10)
 test:do_execsql_test(
     "tkt3935.1",
     [[
-        CREATE TABLE t1(a primary key, b);
-        CREATE TABLE t2(c primary key, d);
+        CREATE TABLE t1(a INT primary key, b INT);
+        CREATE TABLE t2(c INT primary key, d INT);
     ]], {
         -- <tkt3935.1>
         
diff --git a/test/sql-tap/trigger1.test.lua b/test/sql-tap/trigger1.test.lua
index 40daba4d8..2d97a4a85 100755
--- a/test/sql-tap/trigger1.test.lua
+++ b/test/sql-tap/trigger1.test.lua
@@ -202,7 +202,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "trigger1-1.10",
     [[
-        create table t1(a int PRIMARY KEY,b);
+        create table t1(a int PRIMARY KEY,b INT);
         insert into t1 values(1,'a');
         insert into t1 values(2,'b');
         insert into t1 values(3,'c');
@@ -222,7 +222,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "trigger1-1.11",
     [[
-        create table t1(a int PRIMARY KEY,b);
+        create table t1(a int PRIMARY KEY,b INT);
         create table tt1(a int PRIMARY KEY);
         insert into t1 values(1,'a');
         insert into t1 values(2,'b');
@@ -245,7 +245,7 @@ test:do_execsql_test(
 test:do_catchsql_test(
     "trigger1-1.12",
     [[
-        create table t1(a int PRIMARY KEY,b);
+        create table t1(a int PRIMARY KEY,b INT);
         create trigger t1t instead of update on t1 for each row begin
           delete from t1 WHERE a=old.a+2;
         end;
@@ -378,7 +378,7 @@ test:do_catchsql_test(
 --   do_test trigger1-3.7 {
 --     execsql {
 --       DROP TABLE t2;
---       CREATE TABLE t2(x,y);
+--       CREATE TABLE t2(x INT,y INT);
 --       SELECT * FROM t2;
 --     }
 --   } {}
@@ -452,14 +452,14 @@ test:do_catchsql_test(
 --   } {3 4 7 8}
 -- } else {
 --   execsql {
---     CREATE TABLE t2(x,y);
+--     CREATE TABLE t2(x INT,y INT);
 --     DROP TABLE t1;
 --     INSERT INTO t2 VALUES(3, 4);
 --     INSERT INTO t2 VALUES(7, 8);
 --   }
 -- }
 test:execsql [[
-    CREATE TABLE t2(x int PRIMARY KEY,y);
+    CREATE TABLE t2(x int PRIMARY KEY,y INT);
     DROP TABLE t1;
     INSERT INTO t2 VALUES(3, 4);
     INSERT INTO t2 VALUES(7, 8);
@@ -586,8 +586,8 @@ test:do_execsql_test(
 -- MUST_WORK_TEST
 --     do_test trigger1-9.1 {
 --       execsql {
---         CREATE TABLE t3(a,b int PRIMARY KEY);
---         CREATE TABLE t4(x int PRIMARY KEY, b);
+--         CREATE TABLE t3(a INT,b int PRIMARY KEY);
+--         CREATE TABLE t4(x int PRIMARY KEY, b INT);
 --         CREATE TRIGGER r34 AFTER INSERT ON t3 BEGIN
 --           REPLACE INTO t4 VALUES(new.a,new.b);
 --         END;
@@ -605,8 +605,8 @@ test:do_execsql_test(
 --   } else {
 --     do_test trigger1-9.1 {
 --       execsql {
---         CREATE TABLE t3(a, b int PRIMARY KEY);
---         CREATE TABLE t4(x int PRIMARY KEY, b);
+--         CREATE TABLE t3(a INT, b int PRIMARY KEY);
+--         CREATE TABLE t4(x int PRIMARY KEY, b INT);
 --         CREATE TRIGGER r34 AFTER INSERT ON t3 BEGIN
 --           REPLACE INTO t4 VALUES(new.a,new.b);
 --         END;
@@ -632,7 +632,7 @@ test:do_execsql_test(
 -- #
 -- # Also verify that references within trigger programs are resolved at
 -- # statement compile time, not trigger installation time. This means, for
--- # example, that you can drop and re-create tables referenced by triggers.
+-- # example, that INT you can drop and re-create tables referenced by triggers.
 -- ifcapable tempdb&&attach {
 --   do_test trigger1-10.0 {
 --     forcedelete test2.db
@@ -643,10 +643,10 @@ test:do_execsql_test(
 --   } {}
 --   do_test trigger1-10.1 {
 --     execsql {
---       CREATE TABLE main.t4(a, b, c);
---       CREATE TABLE temp.t4(a, b, c);
---       CREATE TABLE aux.t4(a, b, c);
---       CREATE TABLE insert_log(db, a, b, c);
+--       CREATE TABLE main.t4(a, b INT, c INT);
+--       CREATE TABLE temp.t4(a, b INT, c INT);
+--       CREATE TABLE aux.t4(a, b INT, c INT);
+--       CREATE TABLE insert_log(db, a INT, b INT, c INT);
 --     }
 --   } {}
 --   do_test trigger1-10.2 {
@@ -707,7 +707,7 @@ test:do_execsql_test(
 --   # use them explicitly.
 --     execsql {
 --       DROP TABLE insert_log;
---       CREATE TABLE aux.insert_log(db, d, e, f);
+--       CREATE TABLE aux.insert_log(db, d INT, e INT, f INT);
 --     }
 --   } {}
 --   do_test trigger1-10.10 {
@@ -736,7 +736,7 @@ test:do_catchsql_test(
 -- MUST_WORK_TEST
 -- do_test trigger1-15.1 {
 --   execsql {
---     CREATE TABLE tA(a INTEGER PRIMARY KEY, b, c);
+--     CREATE TABLE tA(a INTEGER PRIMARY KEY, b INT, c INT);
 --     CREATE TRIGGER tA_trigger BEFORE UPDATE ON "tA" BEGIN SELECT 1; END;
 --     INSERT INTO tA VALUES(1, 2, 3);
 --   }
@@ -746,7 +746,7 @@ test:do_catchsql_test(
 --   catchsql { INSERT INTO tA VALUES('abc', 2, 3) }
 -- } {1 {datatype mismatch}}
 test:execsql [[
-    CREATE TABLE tA(a INTEGER PRIMARY KEY, b, c);
+    CREATE TABLE tA(a INTEGER PRIMARY KEY, b INT, c INT);
     CREATE TRIGGER tA_trigger BEFORE UPDATE ON tA BEGIN SELECT 1; END;
     INSERT INTO tA VALUES(1, 2, 3);
 ]]
@@ -759,7 +759,7 @@ test:do_test(
     "trigger1-16.1",
     function()
         test:execsql [[
-            CREATE TABLE t16(a int PRIMARY KEY,b,c);
+            CREATE TABLE t16(a int PRIMARY KEY,b INT,c INT);
             CREATE INDEX t16b ON t16(b);
         ]]
         return test:catchsql [[
@@ -877,7 +877,7 @@ test:do_catchsql_test(
 -- #
 -- do_execsql_test trigger1-17.0 {
 --   CREATE TABLE t17a(ii INT);
---   CREATE TABLE t17b(tt TEXT PRIMARY KEY, ss);
+--   CREATE TABLE t17b(tt TEXT PRIMARY KEY, ss INT);
 --   CREATE TRIGGER t17a_ai AFTER INSERT ON t17a BEGIN
 --     INSERT INTO t17b(tt) VALUES(new.ii);
 --   END;
diff --git a/test/sql-tap/trigger4.test.lua b/test/sql-tap/trigger4.test.lua
index 32528cfae..f6056617f 100755
--- a/test/sql-tap/trigger4.test.lua
+++ b/test/sql-tap/trigger4.test.lua
@@ -20,8 +20,8 @@ test:plan(1)
 test:do_execsql_test(
     "trigger4-1.1",
     [[
-        create table test1(id integer primary key,a);
-        create table test2(id integer primary key,b);
+        create table test1(id integer primary key,a INT);
+        create table test2(id integer primary key,b INT);
         create view test as
           select test1.id as id,a as a,b as b
           from test1 join test2 on test2.id =  test1.id;
@@ -111,7 +111,7 @@ test:do_execsql_test(
 -- } {1 22 4 5}
 -- do_test trigger4-3.5 {
 --   execsql {
---     create table test2(id,b);
+--     create table test2(id INT, b INT);
 --     insert into test values(7,8,9);
 --     select * from test1;
 --   }
diff --git a/test/sql-tap/trigger7.test.lua b/test/sql-tap/trigger7.test.lua
index f67140cd0..21ff2af4d 100755
--- a/test/sql-tap/trigger7.test.lua
+++ b/test/sql-tap/trigger7.test.lua
@@ -40,7 +40,7 @@ test:do_test(
     "trigger7-2.1",
     function()
         test:execsql [[
-			CREATE TABLE t1(x PRIMARY KEY, y);
+			CREATE TABLE t1(x INT PRIMARY KEY, y INT);
             CREATE TRIGGER r1 AFTER UPDATE OF x ON t1 BEGIN
               SELECT '___update_t1.x___';
             END;
@@ -109,7 +109,7 @@ test:do_test(
 test:do_execsql_test(
     "trigger7-3.1",
     [[
-        CREATE TABLE t2(x PRIMARY KEY,y,z);
+        CREATE TABLE t2(x INT PRIMARY KEY,y INT,z INT);
         CREATE TRIGGER t2r1 AFTER INSERT ON t2 BEGIN SELECT 1; END;
         CREATE TRIGGER t2r2 BEFORE INSERT ON t2 BEGIN SELECT 1; END;
         CREATE TRIGGER t2r3 AFTER UPDATE ON t2 BEGIN SELECT 1; END;
diff --git a/test/sql-tap/trigger8.test.lua b/test/sql-tap/trigger8.test.lua
index abe567119..5c3e77377 100755
--- a/test/sql-tap/trigger8.test.lua
+++ b/test/sql-tap/trigger8.test.lua
@@ -34,8 +34,8 @@ test:do_test(
     "trigger8-1.1",
     function()
         test:execsql [[
-            CREATE TABLE t1(x PRIMARY KEY);
-            CREATE TABLE t2(y PRIMARY KEY);
+            CREATE TABLE t1(x INT PRIMARY KEY);
+            CREATE TABLE t2(y INT PRIMARY KEY);
         ]]
         sql = string.format([[CREATE TRIGGER r%s AFTER INSERT ON t1 BEGIN
 ]], nStatement)
diff --git a/test/sql-tap/triggerC.test.lua b/test/sql-tap/triggerC.test.lua
index 347007832..322b43307 100755
--- a/test/sql-tap/triggerC.test.lua
+++ b/test/sql-tap/triggerC.test.lua
@@ -53,8 +53,8 @@ test:execsql " PRAGMA recursive_triggers = on "
 test:do_execsql_test(
     "triggerC-1.1",
     [[
-        CREATE TABLE t1(a PRIMARY KEY, b, c);
-        CREATE TABLE log(t PRIMARY KEY, a1, b1, c1, a2, b2, c2);
+        CREATE TABLE t1(a TEXT PRIMARY KEY, b TEXT, c TEXT);
+        CREATE TABLE log(t TEXT PRIMARY KEY, a1 TEXT, b1 TEXT, c1 TEXT, a2 TEXT, b2 TEXT, c2 TEXT);
         CREATE TRIGGER trig1 BEFORE INSERT ON t1 BEGIN
           INSERT INTO log VALUES('before', NULL, NULL, NULL, new.a, new.b, new.c);
         END;
@@ -149,7 +149,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "triggerC-1.8",
     [[
-        CREATE TABLE t4(a PRIMARY KEY, b);
+        CREATE TABLE t4(a INT PRIMARY KEY, b INT);
         CREATE TRIGGER t4t AFTER DELETE ON t4 BEGIN
           SELECT RAISE(ABORT, 'delete is not supported');
         END;
@@ -183,7 +183,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "triggerC-1.11",
     [[
-        CREATE TABLE t5 (a primary key, b, c);
+        CREATE TABLE t5 (a INT primary key, b INT, c INT);
         INSERT INTO t5 values (1, 2, 3);
         CREATE TRIGGER au_tbl AFTER UPDATE ON t5 BEGIN
           UPDATE OR IGNORE t5 SET a = new.a, c = 10;
@@ -207,7 +207,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "triggerC-1.13",
     [[
-        CREATE TABLE t6(a INTEGER PRIMARY KEY, b);
+        CREATE TABLE t6(a INTEGER PRIMARY KEY, b INT);
         INSERT INTO t6 VALUES(1, 2);
         create trigger r1 after update on t6 for each row begin
           SELECT 1;
@@ -223,9 +223,9 @@ test:do_execsql_test(
     "triggerC-1.14",
     [[
         DROP TABLE IF EXISTS t1;
-        CREATE TABLE cnt(n PRIMARY KEY);
+        CREATE TABLE cnt(n INT PRIMARY KEY);
         INSERT INTO cnt VALUES(0);
-        CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE, c, d, e);
+        CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT UNIQUE, c INT, d INT, e INT);
         CREATE INDEX t1cd ON t1(c,d);
         CREATE TRIGGER t1r1 AFTER UPDATE ON t1 BEGIN UPDATE cnt SET n=n+1; END;
         INSERT INTO t1 VALUES(1,2,3,4,5);
@@ -254,7 +254,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "triggerC-2.1.0",
     [[
-        CREATE TABLE t2(a PRIMARY KEY);
+        CREATE TABLE t2(a INT PRIMARY KEY);
     ]], {
         -- <triggerC-2.1.0>
 
@@ -313,7 +313,7 @@ end
 -- test:do_execsql_test(
 --     "triggerC-2.2",
 -- string.format([[
---         CREATE TABLE t22(x PRIMARY KEY);
+--         CREATE TABLE t22(x INT PRIMARY KEY);
 
 --         CREATE TRIGGER t22a AFTER INSERT ON t22 BEGIN
 --           INSERT INTO t22 SELECT x + (SELECT max(x) FROM t22) FROM t22;
@@ -335,7 +335,7 @@ end
 -- test:do_execsql_test(
 --     "triggerC-2.3",
 -- string.format([[
---         CREATE TABLE t23(x PRIMARY KEY);
+--         CREATE TABLE t23(x INT PRIMARY KEY);
 
 --         CREATE TRIGGER t23a AFTER INSERT ON t23 BEGIN
 --           INSERT INTO t23 VALUES(new.x + 1);
@@ -362,7 +362,7 @@ end
 test:do_execsql_test(
     "triggerC-3.1.1",
     [[
-        CREATE TABLE t3(a PRIMARY KEY, b);
+        CREATE TABLE t3(a INT PRIMARY KEY, b INT);
         CREATE TRIGGER t3i AFTER INSERT ON t3 BEGIN
           DELETE FROM t3 WHERE a = new.a;
         END;
@@ -398,7 +398,7 @@ test:do_execsql_test(
 test:do_execsql_test(
     "triggerC-3.2.1",
     [[
-        CREATE TABLE t3b(x PRIMARY KEY);
+        CREATE TABLE t3b(x INT PRIMARY KEY);
         CREATE TRIGGER t3bi AFTER INSERT ON t3b BEGIN INSERT INTO t3b VALUES(new.x+1); END;
     ]], {
         -- <triggerC-3.2.1>
@@ -469,7 +469,7 @@ test:do_test(
         test:catchsql " DROP TABLE log "
         test:catchsql " DROP TABLE t4 "
         return test:execsql [[
-            CREATE TABLE log(id PRIMARY KEY, t);
+            CREATE TABLE log(id INT PRIMARY KEY, t INT);
             CREATE TABLE t4(a TEXT PRIMARY KEY,b INTEGER,c REAL);
             CREATE TRIGGER t4bi BEFORE INSERT ON t4 BEGIN
               INSERT INTO log VALUES((SELECT coalesce(max(id),0) + 1 FROM log),
@@ -605,13 +605,13 @@ test:do_execsql_test(
     "triggerC-5.1.0",
     [[
         DROP TABLE IF EXISTS t5;
-        CREATE TABLE t5(a INTEGER PRIMARY KEY, b);
+        CREATE TABLE t5(a INTEGER PRIMARY KEY, b INT);
         CREATE UNIQUE INDEX t5i ON t5(b);
         INSERT INTO t5 VALUES(1, 'a');
         INSERT INTO t5 VALUES(2, 'b');
         INSERT INTO t5 VALUES(3, 'c');
 
-        CREATE TABLE t5g(a PRIMARY KEY, b, c);
+        CREATE TABLE t5g(a INT PRIMARY KEY, b INT, c INT);
         CREATE TRIGGER t5t BEFORE DELETE ON t5 BEGIN
           INSERT INTO t5g VALUES(old.a, old.b, (SELECT count(*) FROM t5));
         END;
@@ -758,8 +758,8 @@ test:do_execsql_test(
 -- #
 -- do_test triggerC-7.1 {
 --   execsql {
---     CREATE TABLE t8(x);
---     CREATE TABLE t7(a, b);
+--     CREATE TABLE t8(x INT);
+--     CREATE TABLE t7(a INT, b INT);
 --     INSERT INTO t7 VALUES(1, 2);
 --     INSERT INTO t7 VALUES(3, 4);
 --     INSERT INTO t7 VALUES(5, 6);
@@ -850,7 +850,7 @@ test:do_execsql_test(
 -- #
 -- do_test triggerC-9.1 {
 --   execsql {
---     CREATE TABLE t9(a,b);
+--     CREATE TABLE t9(a INT,b INT);
 --     CREATE INDEX t9b ON t9(b);
 --     INSERT INTO t9 VALUES(1,0);
 --     INSERT INTO t9 VALUES(2,1);
@@ -886,7 +886,7 @@ test:do_test(
     "triggerC-10.1",
     function()
         test:execsql [[
-            CREATE TABLE t10(a PRIMARY KEY, updatecnt DEFAULT 0);
+            CREATE TABLE t10(a PRIMARY KEY, updatecnt INT DEFAULT 0);
             CREATE TRIGGER t10_bu BEFORE UPDATE OF a ON t10 BEGIN
               UPDATE t10 SET updatecnt = updatecnt+1 WHERE a = old.a;
             END;
@@ -961,7 +961,7 @@ test:do_test(
     "triggerC-11.0",
     function()
         test:catchsql " DROP TABLE IF EXISTS log "
-        return test:execsql " CREATE TABLE log(id INTEGER PRIMARY KEY, a, b) "
+        return test:execsql " CREATE TABLE log(id INTEGER PRIMARY KEY, a REAL, b TEXT) "
     end, {
         -- <triggerC-11.0>
 
@@ -970,11 +970,11 @@ test:do_test(
 
 -- MUST_WORK_TEST
 local
-tests11 = {-- {"CREATE TABLE t1(a PRIMARY KEY, b)",                         {{}, {}}},
-           {"CREATE TABLE t1(a PRIMARY KEY DEFAULT 1, b DEFAULT 'abc')", {1, "abc"}},
-           {"CREATE TABLE t1(a, b PRIMARY KEY DEFAULT 4.5)",             {"", 4.5}}}
+tests11 = {-- {"CREATE TABLE t1(a REAL PRIMARY KEY, b TEXT)",                         {{}, {}}},
+           {"CREATE TABLE t1(a REAL PRIMARY KEY DEFAULT 1, b TEXT DEFAULT 'abc')", {1, "abc"}},
+           {"CREATE TABLE t1(b TEXT, a REAL PRIMARY KEY DEFAULT 4.5)",             {4.5, ""}}}
 
---for _ in X(0, "X!foreach", [=[["testno tbl defaults","\n  1 \"CREATE TABLE t1(a PRIMARY KEY, b)\"                          {{} {}}\n  2 \"CREATE TABLE t1(a PRIMARY KEY DEFAULT 1, b DEFAULT 'abc')\"  {1 abc}\n  3 \"CREATE TABLE t1(a PRIMARY KEY, b DEFAULT 4.5)\"              {{} 4.5}\n"]]=]) do
+--for _ in X(0, "X!foreach", [=[["testno tbl defaults","\n  1 \"CREATE TABLE t1(a PRIMARY KEY, b)\"                          {{} {}}\n  2 \"CREATE TABLE t1(a REAL PRIMARY KEY DEFAULT 1, b TEXT DEFAULT 'abc')\"  {1 abc}\n  3 \"CREATE TABLE t1(b TEXT PRIMARY KEY, a REAL DEFAULT 4.5)\"              {{} 4.5}\n"]]=]) do
 for testno, v in ipairs(tests11) do
     test:do_test(
         "triggerC-11."..testno..".1",
@@ -1031,7 +1031,7 @@ test:do_test(
         test:catchsql " DROP TABLE t2 "
         return test:execsql [[
             DELETE FROM log;
-            CREATE TABLE t2(a PRIMARY KEY, b);
+            CREATE TABLE t2(a INT PRIMARY KEY, b INT);
             CREATE VIEW v2 AS SELECT * FROM t2;
             CREATE TRIGGER tv2 INSTEAD OF INSERT ON v2 BEGIN
               INSERT INTO log VALUES((SELECT coalesce(max(id),0) + 1 FROM log),
@@ -1053,7 +1053,7 @@ test:do_test(
 test:execsql(
     [[
     DROP TABLE t1;
-    CREATE TABLE t1(id INTEGER PRIMARY KEY, a, b);
+    CREATE TABLE t1(id INTEGER PRIMARY KEY, a INT, b INT);
     INSERT INTO t1 VALUES(1, 1, 2);
     INSERT INTO t1 VALUES(2, 3, 4);
     INSERT INTO t1 VALUES(3, 5, 6);
@@ -1063,7 +1063,7 @@ test:do_execsql_test(
     "triggerC-13.1",
     [[
         PRAGMA recursive_triggers = 'ON';
-        CREATE TABLE t12(id INTEGER PRIMARY KEY, a, b);
+        CREATE TABLE t12(id INTEGER PRIMARY KEY, a INT, b INT);
         INSERT INTO t12 VALUES(1, 1, 2);
         CREATE TRIGGER tr12 AFTER UPDATE ON t12 BEGIN
           UPDATE t12 SET a=new.a+1, b=new.b+1;
@@ -1100,21 +1100,21 @@ SQL = [[
   DROP TABLE IF EXISTS t2;
   DROP TABLE IF EXISTS t4;
   DROP TABLE IF EXISTS t5;
-  CREATE TABLE t1(a PRIMARY KEY, b, c);
+  CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT);
   CREATE INDEX i1 ON t1(a, c);
   CREATE INDEX i2 ON t1(b, c);
   INSERT INTO t1 VALUES(1, 2, 3);
 
-  CREATE TABLE t2(e PRIMARY KEY, f);
+  CREATE TABLE t2(e INT PRIMARY KEY, f INT);
   CREATE INDEX i3 ON t2(e);
   INSERT INTO t2 VALUES(1234567, 3);
 
-  CREATE TABLE empty(x PRIMARY KEY);
+  CREATE TABLE empty(x INT PRIMARY KEY);
   CREATE TABLE not_empty(x PRIMARY KEY);
   INSERT INTO not_empty VALUES(2);
 
-  CREATE TABLE t4(x PRIMARY KEY);
-  CREATE TABLE t5(g PRIMARY KEY, h, i);
+  CREATE TABLE t4(x INT PRIMARY KEY);
+  CREATE TABLE t5(g INT PRIMARY KEY, h INT, i INT);
 
   CREATE TRIGGER trig BEFORE INSERT ON t4 BEGIN
     INSERT INTO t5 SELECT * FROM t1 WHERE
@@ -1179,7 +1179,7 @@ test:do_execsql_test(
 --     [[
 --         CREATE TABLE   x1  (x PRIMARY KEY);
 
---         CREATE TABLE '"x2"'(a PRIMARY KEY, b);
+--         CREATE TABLE '"x2"'(a PRIMARY KEY, b INT);
 
 --         INSERT INTO x2 VALUES(1, 2);
 --         INSERT INTO x2 VALUES(3, 4);
diff --git a/test/sql-tap/triggerD.test.lua b/test/sql-tap/triggerD.test.lua
index ea2980394..7a6529d40 100755
--- a/test/sql-tap/triggerD.test.lua
+++ b/test/sql-tap/triggerD.test.lua
@@ -36,8 +36,8 @@ test:do_test(
     "triggerD-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(rowid PRIMARY KEY, oid, _rowid_, x);
-            CREATE TABLE log(a PRIMARY KEY,b,c,d,e);
+            CREATE TABLE t1(rowid INT PRIMARY KEY, oid INT, _rowid_, x INT);
+            CREATE TABLE log(a TEXT PRIMARY KEY,b INT,c INT,d INT,e INT);
             CREATE TRIGGER r1 BEFORE INSERT ON t1 BEGIN
               INSERT INTO log VALUES('r1', new.rowid, new.oid, new._rowid_, new.x);
             END;
@@ -112,7 +112,7 @@ test:do_test(
 -- do_test triggerD-2.1 {
 --   db eval {
 --     DROP TABLE t1;
---     CREATE TABLE t1(w PRIMARY KEY,x,y,z);
+--     CREATE TABLE t1(w INT PRIMARY KEY,x INT,y INT,z INT);
 --     CREATE TRIGGER r1 BEFORE INSERT ON t1 BEGIN
 --       INSERT INTO log VALUES('r1', new.rowid, new.oid, new._rowid_, new.x);
 --     END;
@@ -165,9 +165,9 @@ test:do_test(
 -- # and a main database trigge is created on the main table, the trigger
 -- # is incorrectly bound to the TEMP table. For example:
 -- #
--- #   CREATE TABLE t1(x);
+-- #   CREATE TABLE t1(x INT);
 -- #   CREATE TEMP TABLE t1(x);
--- #   CREATE TABLE t2(z);
+-- #   CREATE TABLE t2(z INT);
 -- #   CREATE TRIGGER main.r1 AFTER INSERT ON t1 BEGIN
 -- #     INSERT INTO t2 VALUES(10000 + new.x);
 -- #   END;
@@ -221,10 +221,10 @@ test:do_test(
 --   forcedelete test.db test2.db
 --   sqlite3 db test.db
 --   db eval {
---     CREATE TABLE t1(x);
+--     CREATE TABLE t1(x INT);
 --     ATTACH 'test2.db' AS db2;
---     CREATE TABLE db2.t2(y);
---     CREATE TABLE db2.log(z);
+--     CREATE TABLE db2.t2(y INT);
+--     CREATE TABLE db2.log(z INT);
 --     CREATE TRIGGER db2.trig AFTER INSERT ON db2.t2 BEGIN
 --       INSERT INTO log(z) VALUES(new.y);
 --     END;
diff --git a/test/sql-tap/triggerE.test.lua b/test/sql-tap/triggerE.test.lua
index 6119e8fcd..44d8243a0 100755
--- a/test/sql-tap/triggerE.test.lua
+++ b/test/sql-tap/triggerE.test.lua
@@ -28,9 +28,9 @@ testprefix = "triggerE"
 test:do_execsql_test(
     1.0,
     [[
-        CREATE TABLE t1(a PRIMARY KEY, b);
-        CREATE TABLE t2(c  PRIMARY KEY, d);
-        CREATE TABLE t3(e  PRIMARY KEY, f);
+        CREATE TABLE t1(a INT PRIMARY KEY, b INT);
+        CREATE TABLE t2(c  INT PRIMARY KEY, d INT);
+        CREATE TABLE t3(e  INT PRIMARY KEY, f INT);
     ]])
 
 -- forcedelete test.db2
diff --git a/test/sql-tap/view.test.lua b/test/sql-tap/view.test.lua
index 8ba2044f0..2b8e5e638 100755
--- a/test/sql-tap/view.test.lua
+++ b/test/sql-tap/view.test.lua
@@ -25,7 +25,7 @@ test:plan(65)
 -- ORIGINAL_TEST
 -- do_test view-1.0 {
 --   execsql {
---     CREATE TABLE t1(a,b,c);
+--     CREATE TABLE t1(a INT,b INT,c INT);
 --     INSERT INTO t1 VALUES(1,2,3);
 --     INSERT INTO t1 VALUES(4,5,6);
 --     INSERT INTO t1 VALUES(7,8,9);
@@ -36,7 +36,7 @@ test:plan(65)
 test:do_execsql_test(
     "view-1.0",
     [[
-        CREATE TABLE t1(a primary key,b,c);
+        CREATE TABLE t1(a INT primary key,b INT,c INT);
         INSERT INTO t1 VALUES(1,2,3);
         INSERT INTO t1 VALUES(4,5,6);
         INSERT INTO t1 VALUES(7,8,9);
@@ -135,7 +135,7 @@ test:do_catchsql_test(
 -- ORIGINAL_TEST
 -- do_test view-1.7 {
 --   execsql {
---     CREATE TABLE t1(x,a,b,c);
+--     CREATE TABLE t1(x INT,a INT,b INT,c INT);
 --     INSERT INTO t1 VALUES(1,2,3,4);
 --     INSERT INTO t1 VALUES(4,5,6,7);
 --     INSERT INTO t1 VALUES(7,8,9,10);
@@ -145,7 +145,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "view-1.7",
     [[
-        CREATE TABLE t1(x primary key,a,b,c);
+        CREATE TABLE t1(x INT primary key,a INT,b INT,c INT);
         INSERT INTO t1 VALUES(1,2,3,4);
         INSERT INTO t1 VALUES(4,5,6,7);
         INSERT INTO t1 VALUES(7,8,9,10);
@@ -402,7 +402,7 @@ test:do_catchsql_test(
 test:do_execsql_test(
     "view-5.1",
     [[
-        CREATE TABLE t2(y primary key,a);
+        CREATE TABLE t2(y INT primary key,a INT);
         INSERT INTO t2 VALUES(22,2);
         INSERT INTO t2 VALUES(33,3);
         INSERT INTO t2 VALUES(44,4);
@@ -511,8 +511,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "view-7.1",
     [[
-        CREATE TABLE test1(id integer primary key, a);
-        CREATE TABLE test2(id integer primary key, b);
+        CREATE TABLE test1(id integer primary key, a INT);
+        CREATE TABLE test2(id integer primary key, b INT);
         INSERT INTO test1 VALUES(1,2);
         INSERT INTO test2 VALUES(1,3);
         CREATE VIEW test AS
@@ -806,7 +806,7 @@ if (0 > 0)
     test:do_execsql_test(
         "view-11.1",
         [[
-            CREATE TABLE t4(a COLLATE "unicode_ci" primary key);
+            CREATE TABLE t4(a TEXT COLLATE "unicode_ci" primary key);
             INSERT INTO t4 VALUES('This');
             INSERT INTO t4 VALUES('this');
             INSERT INTO t4 VALUES('THIS');
@@ -821,7 +821,7 @@ if (0 > 0)
     test:do_execsql_test(
         "view-11.1",
         [[
-            CREATE TABLE t4(a COLLATE "unicode_ci" primary key);
+            CREATE TABLE t4(a TEXT COLLATE "unicode_ci" primary key);
             INSERT INTO t4 VALUES('This');
             INSERT INTO t4 VALUES('this');
             INSERT INTO t4 VALUES('THIS');
@@ -885,7 +885,7 @@ test:do_catchsql_test(
 --     forcedelete test2.db
 --     catchsql {
 --       ATTACH 'test2.db' AS two;
---       CREATE TABLE two.t2(x,y);
+--       CREATE TABLE two.t2(x INT,y INT);
 --       CREATE VIEW v13 AS SELECT y FROM two.t2;
 --     }
 --   } {1 {view v13 cannot reference objects in database two}}
@@ -895,7 +895,7 @@ test:do_catchsql_test(
 --    forcedelete test2.db
 --    catchsql {
 --      ATTACH 'test2.db' AS two;
---      CREATE TABLE two.t2(x primary key,y);
+--      CREATE TABLE two.t2(x INT primary key,y INT);
 --      CREATE VIEW v13 AS SELECT y FROM two.t2;
 --    }
 --  } {1 {view v13 cannot reference objects in database two}}
@@ -996,7 +996,7 @@ if (0 > 0)
         [[
             DROP VIEW t1;
             DROP TABLE t1;
-            CREATE TABLE t1(a, b, c);
+            CREATE TABLE t1(a INT, b INT, c INT);
             INSERT INTO t1 VALUES(1, 2, 3);
             INSERT INTO t1 VALUES(4, 5, 6);
 
@@ -1067,7 +1067,7 @@ test:do_execsql_test(
     [[
         DROP TABLE IF EXISTS t1;
         DROP VIEW IF EXISTS v1;
-        CREATE TABLE t1(c1 primary key);
+        CREATE TABLE t1(c1 INT primary key);
         CREATE VIEW v1 AS SELECT c1 FROM (SELECT t1.c1 FROM t1);
     ]], {
         -- <view-20.1>
@@ -1080,7 +1080,7 @@ test:do_execsql_test(
     [[
         DROP TABLE IF EXISTS t1;
         DROP VIEW IF EXISTS v1;
-        CREATE TABLE t1(c1 primary key);
+        CREATE TABLE t1(c1 INT primary key);
         CREATE VIEW v1 AS SELECT c1 FROM (SELECT t1.c1 FROM t1);
     ]], {
         -- <view-20.1>
@@ -1104,7 +1104,7 @@ if (0 > 0)
     test:do_catchsql_test(
         "view-21.1",
         [[
-            CREATE TABLE t1(x primary key);
+            CREATE TABLE t1(x INT primary key);
             INSERT INTO t1 VALUES(5);
             CREATE VIEW v1 AS SELECT x*2 FROM t1;
             CREATE VIEW v2 AS SELECT * FROM v1 UNION SELECT * FROM v1;
diff --git a/test/sql-tap/where4.test.lua b/test/sql-tap/where4.test.lua
index 5ed9e994d..6c9c242ba 100755
--- a/test/sql-tap/where4.test.lua
+++ b/test/sql-tap/where4.test.lua
@@ -33,7 +33,7 @@ test:do_execsql_test(
     [[
         -- Tarantool. As far as rowid was replaced w/ PK - no NULLs allowed anymore.
         -- Comment those lines.
-            CREATE TABLE t1(w, x, y, primary key (w,x,y));
+            CREATE TABLE t1(w INT, x INT, y INT, primary key (w,x,y));
             INSERT INTO t1 VALUES(1,2,3);
         --    INSERT INTO t1 VALUES(1,NULL,3);
             INSERT INTO t1 VALUES('a','b','c');
@@ -134,11 +134,11 @@ test:do_execsql_test(
 -- Tarantool. As far as NULLs are prohibited for PKs (was UNIQUE + rowid) - block 4-3.* completely
 -- do_test where4-3.1 {
 --   execsql {
---     CREATE TABLE t2(a primary key);
+--     CREATE TABLE t2(a INT primary key);
 --     INSERT INTO t2 VALUES(1);
 --     INSERT INTO t2 VALUES(2);
 --     INSERT INTO t2 VALUES(3);
---     CREATE TABLE t3(x,y, primary key("x", 'y')); -- Goofy syntax allowed
+--     CREATE TABLE t3(x INT,y INT, primary key("x", 'y')); -- Goofy syntax allowed
 --     INSERT INTO t3 VALUES(1,11);
 --     INSERT INTO t3 VALUES(2,NULL);
 --     SELECT * FROM t2 LEFT JOIN t3 ON a=x WHERE +y IS NULL;
@@ -216,17 +216,17 @@ test:do_execsql_test(
 
 -- Ticket #2273.  Problems with IN operators and NULLs.
 --
--- X(203, "X!cmd", [=[["ifcapable","subquery","\ndo_test where4-5.1 {\n  execsql {\n    -- Allow the 'x' syntax for backwards compatibility\n    CREATE TABLE t4(x,y,z,PRIMARY KEY('x' ASC, \"y\" ASC));\n  } } {}\n# execsql {\n#   SELECT *\n#     FROM t2 LEFT JOIN t4 b1\n#             LEFT JOIN t4 b2 ON b2.x=b1.x AND b2.y IN (b1.y);\n# }\n# ","1 {} {} {} {} {} {} 2 {} {} {} {} {} {} 3 {} {} {} {} {} {}"]]=])
+-- X(203, "X!cmd", [=[["ifcapable","subquery","\ndo_test where4-5.1 {\n  execsql {\n    -- Allow the 'x' syntax for backwards compatibility\n    CREATE TABLE t4(x INT,y INT,z INT,PRIMARY KEY('x' ASC, \"y\" ASC));\n  } } {}\n# execsql {\n#   SELECT *\n#     FROM t2 LEFT JOIN t4 b1\n#             LEFT JOIN t4 b2 ON b2.x=b1.x AND b2.y IN (b1.y);\n# }\n# ","1 {} {} {} {} {} {} 2 {} {} {} {} {} {} 3 {} {} {} {} {} {}"]]=])
 test:do_execsql_test(
     "where4-5.1",
     [[
-        CREATE TABLE t2(a primary key);
+        CREATE TABLE t2(a INT primary key);
         INSERT INTO t2 VALUES(1);
         INSERT INTO t2 VALUES(2);
         INSERT INTO t2 VALUES(3);
 
         -- Allow the 'x' syntax for backwards compatibility
-        CREATE TABLE t4(x,y,z,PRIMARY KEY(x ASC, y ASC));
+        CREATE TABLE t4(x INT,y INT,z INT,PRIMARY KEY(x ASC, y ASC));
 
         SELECT *
           FROM t2 LEFT JOIN t4 b1
@@ -259,7 +259,7 @@ test:do_execsql_test(
 -- } {1 2 4}
 -- do_test where4-6.1 {
 --   execsql {
---     CREATE TABLE t5(a,b,c,d,e,f,UNIQUE(a,b,c,d,e,f));
+--     CREATE TABLE t5(a INT,b INT,c INT,d INT,e INT,f INT,UNIQUE INT (a,b INT,c INT,d INT,e INT,f INT));
 --     INSERT INTO t5 VALUES(1,1,1,1,1,11111);
 --     INSERT INTO t5 VALUES(2,2,2,2,2,22222);
 --     INSERT INTO t5 VALUES(1,2,3,4,5,12345);
@@ -280,7 +280,7 @@ test:do_test(
     "where4-7.1",
     function()
         test:execsql [[
-            CREATE TABLE t6(y,z,PRIMARY KEY(y,z));
+            CREATE TABLE t6(y INT,z INT,PRIMARY KEY(y,z));
         ]]
         return test:execsql [[
             SELECT * FROM t6 WHERE y=NULL AND z IN ('hello');
@@ -295,9 +295,9 @@ test:do_test(
 -- do_test where4-7.1 {
 --   execsql {
 --     BEGIN;
---     CREATE TABLE t8(a primary key, b, c, d);
+--     CREATE TABLE t8(a INT primary key, b INT, c INT, d INT);
 --     CREATE INDEX t8_i ON t8(a, b, c);
---     CREATE TABLE t7(i primary key);
+--     CREATE TABLE t7(i INT primary key);
 --     INSERT INTO t7 VALUES(1);
 --     INSERT INTO t7 SELECT i*2 FROM t7;
 --     INSERT INTO t7 SELECT i*2 FROM t7;
@@ -326,7 +326,7 @@ test:do_test(
 -- # correctly.
 -- unset -nocomplain null
 -- do_execsql_test 8.1 {
---   CREATE TABLE u9(a UNIQUE, b);
+--   CREATE TABLE u9(a INT UNIQUE, b INT);
 --   INSERT INTO u9 VALUES(NULL, 1);
 --   INSERT INTO u9 VALUES(NULL, 2);
 -- }
diff --git a/test/sql-tap/where7.test.lua b/test/sql-tap/where7.test.lua
index 75bb7b666..b2e03ea0d 100755
--- a/test/sql-tap/where7.test.lua
+++ b/test/sql-tap/where7.test.lua
@@ -42,7 +42,7 @@ end
 test:do_execsql_test(
     "where7-1.1",
     [[
-        CREATE TABLE t1(a INTEGER PRIMARY KEY,b,c,d);
+        CREATE TABLE t1(a INTEGER PRIMARY KEY,b INT,c INT,d INT);
         INSERT INTO t1 VALUES(1,2,3,4);
         INSERT INTO t1 VALUES(2,3,4,5);
         INSERT INTO t1 VALUES(3,4,6,8);
@@ -320,7 +320,7 @@ test:do_test(
     "where7-2.1",
     function()
         return test:execsql [[
-            CREATE TABLE t2(a INTEGER PRIMARY KEY,b,c,d,e,f TEXT,g);
+            CREATE TABLE t2(a INTEGER PRIMARY KEY,b INT,c INT,d INT,e INT,f TEXT,g INT);
             INSERT INTO t2 VALUES(1,11,1001,1.001,100.1,'bcdefghij','yxwvuts');
             INSERT INTO t2 VALUES(2,22,1001,2.002,100.1,'cdefghijk','yxwvuts');
             INSERT INTO t2 VALUES(3,33,1001,3.0029999999999997,100.1,'defghijkl','xwvutsr');
@@ -427,7 +427,7 @@ test:do_test(
             CREATE INDEX t2e ON t2(e);
             CREATE INDEX t2f ON t2(f);
             CREATE INDEX t2g ON t2(g);
-            CREATE TABLE t3(a INTEGER PRIMARY KEY,b,c,d,e,f TEXT,g);
+            CREATE TABLE t3(a INTEGER PRIMARY KEY,b INT,c INT,d INT,e INT,f TEXT,g INT);
             INSERT INTO t3 SELECT * FROM t2;
             CREATE INDEX t3b ON t3(b,c);
             CREATE INDEX t3c ON t3(c,e);
diff --git a/test/sql-tap/whereA.test.lua b/test/sql-tap/whereA.test.lua
index 773023e01..eb1bb6427 100755
--- a/test/sql-tap/whereA.test.lua
+++ b/test/sql-tap/whereA.test.lua
@@ -23,7 +23,7 @@ test:do_test(
     "whereA-1.1",
     function()
         return test:execsql [[
-            CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE, c);
+            CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT UNIQUE, c INT);
             INSERT INTO t1 VALUES(1,2,3);
             INSERT INTO t1 values(2,'hello','world');
             INSERT INTO t1 VALUES(3,4.53,NULL);
@@ -179,7 +179,7 @@ test:do_test(
     "whereA-4.1",
     function()
         return test:execsql [[
-            CREATE TABLE t2(id int primary key, x);
+            CREATE TABLE t2(id int primary key, x INT);
             INSERT INTO t2 VALUES(1, 1);
             INSERT INTO t2 VALUES(2, 2);
             SELECT x FROM t2;
diff --git a/test/sql-tap/whereC.test.lua b/test/sql-tap/whereC.test.lua
index e7154c5e6..89459dee3 100755
--- a/test/sql-tap/whereC.test.lua
+++ b/test/sql-tap/whereC.test.lua
@@ -21,7 +21,7 @@ testprefix = "whereC"
 test:do_execsql_test(
     1.0,
     [[
-        CREATE TABLE t1(i INTEGER PRIMARY KEY, a, b INTEGER);
+        CREATE TABLE t1(i INTEGER PRIMARY KEY, a INT, b INTEGER);
 
         INSERT INTO t1 VALUES(1, 1, 1);
         INSERT INTO t1 VALUES(2, 1, 1);
diff --git a/test/sql-tap/whereF.test.lua b/test/sql-tap/whereF.test.lua
index cd2cbde34..5a894b748 100755
--- a/test/sql-tap/whereF.test.lua
+++ b/test/sql-tap/whereF.test.lua
@@ -52,8 +52,8 @@ testprefix = "whereF"
 test:do_execsql_test(
     1.0,
     [[
-        CREATE TABLE t1(a PRIMARY KEY, b, c);
-        CREATE TABLE t2(d PRIMARY KEY, e, f);
+        CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT);
+        CREATE TABLE t2(d INT PRIMARY KEY, e INT, f INT);
     ]], {
         -- <1.0>
         
@@ -78,8 +78,8 @@ test:do_execsql_test(
     [[
         DROP TABLE t1;
         DROP TABLE t2;
-        CREATE TABLE t1(a PRIMARY KEY, b, c);
-        CREATE TABLE t2(d PRIMARY KEY, e, f);
+        CREATE TABLE t1(a INT PRIMARY KEY, b INT, c INT);
+        CREATE TABLE t2(d INT PRIMARY KEY, e INT, f INT);
 
         CREATE UNIQUE INDEX i2 ON t1(b);
     ]], {
@@ -107,8 +107,8 @@ test:do_execsql_test(
     [[
         DROP TABLE t1;
         DROP TABLE t2;
-        CREATE TABLE t1(a, b, c, PRIMARY KEY(a,b));
-        CREATE TABLE t2(d PRIMARY KEY, e, f);
+        CREATE TABLE t1(a INT, b INT, c INT, PRIMARY KEY(a,b));
+        CREATE TABLE t2(d INT PRIMARY KEY, e INT, f INT);
     ]], {
         -- <3.0>
         
@@ -145,7 +145,7 @@ test:do_test(
 test:do_execsql_test(
     4.0,
     [[
-        CREATE TABLE t4(a,b,c,d,e, PRIMARY KEY(a,b,c));
+        CREATE TABLE t4(a INT,b INT,c INT,d INT,e INT, PRIMARY KEY(a,b,c));
         CREATE INDEX t4adc ON t4(a,d,c);
         CREATE UNIQUE INDEX t4aebc ON t4(a,e,b,c);
         EXPLAIN QUERY PLAN SELECT a FROM t4 WHERE a=? AND b=?;
-- 
2.17.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tarantool-patches] [PATCH 2/2] Fix some sql tests against static types
  2018-04-19  9:15 [tarantool-patches] [PATCH 0/2] Update some sql tests against static types Georgy Kirichenko
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 1/2] Convert some tests into a static-types form Georgy Kirichenko
@ 2018-04-19  9:15 ` Georgy Kirichenko
  2018-04-19  9:20   ` [tarantool-patches] " Vladislav Shpilevoy
  1 sibling, 1 reply; 5+ messages in thread
From: Georgy Kirichenko @ 2018-04-19  9:15 UTC (permalink / raw)
  To: tarantool-patches; +Cc: Georgy Kirichenko

Update sql tests
Issue #3102
---
 test/sql/check-clear-ephemeral.result                  |  2 +-
 test/sql/check-clear-ephemeral.test.lua                |  2 +-
 test/sql/clear.result                                  |  2 +-
 test/sql/clear.test.lua                                |  2 +-
 test/sql/delete-multiple-idx.result                    |  2 +-
 test/sql/delete-multiple-idx.test.lua                  |  2 +-
 test/sql/delete.result                                 |  2 +-
 test/sql/delete.test.lua                               |  2 +-
 test/sql/drop-index.result                             |  2 +-
 test/sql/drop-index.test.lua                           |  2 +-
 test/sql/drop-table.result                             |  2 +-
 test/sql/drop-table.test.lua                           |  2 +-
 test/sql/errinj.result                                 |  2 +-
 test/sql/errinj.test.lua                               |  2 +-
 test/sql/gh-2929-primary-key.result                    | 10 +++++-----
 test/sql/gh-2929-primary-key.test.lua                  | 10 +++++-----
 test/sql/gh-3199-no-mem-leaks.result                   |  6 +++---
 test/sql/gh-3199-no-mem-leaks.test.lua                 |  6 +++---
 test/sql/gh2141-delete-trigger-drop-table.result       |  2 +-
 test/sql/gh2141-delete-trigger-drop-table.test.lua     |  2 +-
 test/sql/gh2251-multiple-update.result                 |  4 ++--
 test/sql/gh2251-multiple-update.test.lua               |  4 ++--
 test/sql/gh2808-inline-unique-persistency-check.result |  2 +-
 .../gh2808-inline-unique-persistency-check.test.lua    |  2 +-
 test/sql/insert-unique.result                          |  2 +-
 test/sql/insert-unique.test.lua                        |  2 +-
 test/sql/iproto.result                                 |  6 +++---
 test/sql/iproto.test.lua                               |  6 +++---
 test/sql/max-on-index.result                           |  2 +-
 test/sql/max-on-index.test.lua                         |  2 +-
 test/sql/misc.result                                   |  2 +-
 test/sql/misc.test.lua                                 |  2 +-
 test/sql/persistency.result                            | 10 +++++-----
 test/sql/persistency.test.lua                          |  8 ++++----
 test/sql/select-null.result                            |  2 +-
 test/sql/select-null.test.lua                          |  2 +-
 test/sql/transition.result                             | 10 +++++-----
 test/sql/transition.test.lua                           | 10 +++++-----
 test/sql/update-with-nested-select.result              |  2 +-
 test/sql/update-with-nested-select.test.lua            |  2 +-
 test/sql/view.result                                   |  2 +-
 test/sql/view.test.lua                                 |  2 +-
 42 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/test/sql/check-clear-ephemeral.result b/test/sql/check-clear-ephemeral.result
index 156e06a4a..b4c2ce029 100644
--- a/test/sql/check-clear-ephemeral.result
+++ b/test/sql/check-clear-ephemeral.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE t1(a,b,c,PRIMARY KEY(b,c));")
+box.sql.execute("CREATE TABLE t1(a int, b int, c int,PRIMARY KEY(b,c));")
 ---
 ...
 -- Debug
diff --git a/test/sql/check-clear-ephemeral.test.lua b/test/sql/check-clear-ephemeral.test.lua
index 8a5787b04..9cf533e17 100644
--- a/test/sql/check-clear-ephemeral.test.lua
+++ b/test/sql/check-clear-ephemeral.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE t1(a,b,c,PRIMARY KEY(b,c));")
+box.sql.execute("CREATE TABLE t1(a int, b int, c int,PRIMARY KEY(b,c));")
 
 -- Debug
 -- box.sql.execute("PRAGMA vdbe_debug=ON ; INSERT INTO zoobar VALUES (111, 222, 'c3', 444)")
diff --git a/test/sql/clear.result b/test/sql/clear.result
index d267245f3..828d14c2b 100644
--- a/test/sql/clear.result
+++ b/test/sql/clear.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE zoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zoobar (c1 int, c2 int PRIMARY KEY, c3 text, c4 int)")
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zoobar(c1, c4)")
diff --git a/test/sql/clear.test.lua b/test/sql/clear.test.lua
index 068a7c129..10adfb954 100644
--- a/test/sql/clear.test.lua
+++ b/test/sql/clear.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE zoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zoobar (c1 int, c2 int PRIMARY KEY, c3 text, c4 int)")
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zoobar(c1, c4)")
 
 -- Debug
diff --git a/test/sql/delete-multiple-idx.result b/test/sql/delete-multiple-idx.result
index 000dad2a3..4320bf96a 100644
--- a/test/sql/delete-multiple-idx.result
+++ b/test/sql/delete-multiple-idx.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- Create space.
-box.sql.execute("CREATE TABLE t3(id primary key,x,y);");
+box.sql.execute("CREATE TABLE t3(id int primary key,x int,y int);");
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX t3y ON t3(y);");
diff --git a/test/sql/delete-multiple-idx.test.lua b/test/sql/delete-multiple-idx.test.lua
index 26c19a03d..2b7dbed9d 100644
--- a/test/sql/delete-multiple-idx.test.lua
+++ b/test/sql/delete-multiple-idx.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- Create space.
-box.sql.execute("CREATE TABLE t3(id primary key,x,y);");
+box.sql.execute("CREATE TABLE t3(id int primary key,x int,y int);");
 box.sql.execute("CREATE UNIQUE INDEX t3y ON t3(y);");
 
 -- Debug.
diff --git a/test/sql/delete.result b/test/sql/delete.result
index b7dc588a9..14eac5aac 100644
--- a/test/sql/delete.result
+++ b/test/sql/delete.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE t1(a, b, PRIMARY KEY(a, b));");
+box.sql.execute("CREATE TABLE t1(a int, b int, PRIMARY KEY(a, b));");
 ---
 ...
 -- Debug
diff --git a/test/sql/delete.test.lua b/test/sql/delete.test.lua
index 69d8ff9f6..46a6fbf7c 100644
--- a/test/sql/delete.test.lua
+++ b/test/sql/delete.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE t1(a, b, PRIMARY KEY(a, b));");
+box.sql.execute("CREATE TABLE t1(a int, b int, PRIMARY KEY(a, b));");
 
 -- Debug
 -- box.sql.execute("PRAGMA vdbe_debug=ON ; INSERT INTO zoobar VALUES (111, 222, 'c3', 444)")
diff --git a/test/sql/drop-index.result b/test/sql/drop-index.result
index 9fa8b8b75..a8650aa69 100644
--- a/test/sql/drop-index.result
+++ b/test/sql/drop-index.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE zzoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zzoobar (c1 int, c2 int PRIMARY KEY, c3 text, c4 int)")
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zzoobar(c1, c4)")
diff --git a/test/sql/drop-index.test.lua b/test/sql/drop-index.test.lua
index d39d33b64..d8a82a0f7 100644
--- a/test/sql/drop-index.test.lua
+++ b/test/sql/drop-index.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE zzoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zzoobar (c1 int, c2 int PRIMARY KEY, c3 text, c4 int)")
 
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zzoobar(c1, c4)")
 box.sql.execute("CREATE        INDEX zoobar3 ON zzoobar(c3)")
diff --git a/test/sql/drop-table.result b/test/sql/drop-table.result
index e89176454..c76e74226 100644
--- a/test/sql/drop-table.result
+++ b/test/sql/drop-table.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE zzzoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zzzoobar (c1 int, c2 int PRIMARY KEY, c3 varchar(20), c4 int)")
 ---
 ...
 -- Debug
diff --git a/test/sql/drop-table.test.lua b/test/sql/drop-table.test.lua
index a72156385..bc2a8cf5a 100644
--- a/test/sql/drop-table.test.lua
+++ b/test/sql/drop-table.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE zzzoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zzzoobar (c1 int, c2 int PRIMARY KEY, c3 varchar(20), c4 int)")
 
 -- Debug
 -- box.sql.execute("PRAGMA vdbe_debug=ON ; INSERT INTO zzzoobar VALUES (111, 222, 'c3', 444)")
diff --git a/test/sql/errinj.result b/test/sql/errinj.result
index 00a0d6bab..19c7f0b3b 100644
--- a/test/sql/errinj.result
+++ b/test/sql/errinj.result
@@ -7,7 +7,7 @@ errinj = box.error.injection
 fiber = require('fiber')
 ---
 ...
-box.sql.execute('create table test (id primary key, a float, b text)')
+box.sql.execute('create table test (id int primary key, a float, b text)')
 ---
 ...
 box.schema.user.grant('guest','read,write,execute', 'universe')
diff --git a/test/sql/errinj.test.lua b/test/sql/errinj.test.lua
index 63d306312..c5f3eca22 100644
--- a/test/sql/errinj.test.lua
+++ b/test/sql/errinj.test.lua
@@ -2,7 +2,7 @@ remote = require('net.box')
 errinj = box.error.injection
 fiber = require('fiber')
 
-box.sql.execute('create table test (id primary key, a float, b text)')
+box.sql.execute('create table test (id int primary key, a float, b text)')
 box.schema.user.grant('guest','read,write,execute', 'universe')
 cn = remote.connect(box.cfg.listen)
 cn:ping()
diff --git a/test/sql/gh-2929-primary-key.result b/test/sql/gh-2929-primary-key.result
index 53896fcda..26710e866 100644
--- a/test/sql/gh-2929-primary-key.result
+++ b/test/sql/gh-2929-primary-key.result
@@ -4,22 +4,22 @@
 box.cfg{}
 ---
 ...
-box.sql.execute("CREATE TABLE t1(a INT PRIMARY KEY, b UNIQUE)")
+box.sql.execute("CREATE TABLE t1(a INT PRIMARY KEY, b int UNIQUE)")
 ---
 ...
-box.sql.execute("CREATE TABLE t2(a UNIQUE, b)")
+box.sql.execute("CREATE TABLE t2(a int UNIQUE, b int)")
 ---
 - error: PRIMARY KEY missing on table T2
 ...
-box.sql.execute("CREATE TABLE t3(a)")
+box.sql.execute("CREATE TABLE t3(a int)")
 ---
 - error: PRIMARY KEY missing on table T3
 ...
-box.sql.execute("CREATE TABLE t4(a, b)")
+box.sql.execute("CREATE TABLE t4(a int, b int)")
 ---
 - error: PRIMARY KEY missing on table T4
 ...
-box.sql.execute("CREATE TABLE t5(a, b UNIQUE)")
+box.sql.execute("CREATE TABLE t5(a int, b int UNIQUE)")
 ---
 - error: PRIMARY KEY missing on table T5
 ...
diff --git a/test/sql/gh-2929-primary-key.test.lua b/test/sql/gh-2929-primary-key.test.lua
index 27338a6ce..95d4f7ac4 100644
--- a/test/sql/gh-2929-primary-key.test.lua
+++ b/test/sql/gh-2929-primary-key.test.lua
@@ -4,11 +4,11 @@
 
 box.cfg{}
 
-box.sql.execute("CREATE TABLE t1(a INT PRIMARY KEY, b UNIQUE)")
-box.sql.execute("CREATE TABLE t2(a UNIQUE, b)")
+box.sql.execute("CREATE TABLE t1(a INT PRIMARY KEY, b int UNIQUE)")
+box.sql.execute("CREATE TABLE t2(a int UNIQUE, b int)")
 
-box.sql.execute("CREATE TABLE t3(a)")
-box.sql.execute("CREATE TABLE t4(a, b)")
-box.sql.execute("CREATE TABLE t5(a, b UNIQUE)")
+box.sql.execute("CREATE TABLE t3(a int)")
+box.sql.execute("CREATE TABLE t4(a int, b int)")
+box.sql.execute("CREATE TABLE t5(a int, b int UNIQUE)")
 
 box.sql.execute("DROP TABLE t1")
diff --git a/test/sql/gh-3199-no-mem-leaks.result b/test/sql/gh-3199-no-mem-leaks.result
index 682ca62a7..4645378cf 100644
--- a/test/sql/gh-3199-no-mem-leaks.result
+++ b/test/sql/gh-3199-no-mem-leaks.result
@@ -8,7 +8,7 @@ fiber = require('fiber')
 -- executing SQL queries.
 --
 -- box.cfg()
-box.sql.execute('CREATE TABLE test (id PRIMARY KEY, x INTEGER, y INTEGER)')
+box.sql.execute('CREATE TABLE test (id INT PRIMARY KEY, x INTEGER, y INTEGER)')
 ---
 ...
 box.sql.execute('INSERT INTO test VALUES (1, 1, 1), (2, 2, 2)')
@@ -47,7 +47,7 @@ fiber.info()[fiber.self().id()].memory.used
 ---
 - 0
 ...
-box.sql.execute('CREATE TABLE test2 (id PRIMARY KEY, a TEXT, b INTEGER)')
+box.sql.execute('CREATE TABLE test2 (id INT PRIMARY KEY, a TEXT, b INTEGER)')
 ---
 ...
 box.sql.execute('INSERT INTO test2 VALUES (1, \'abc\', 1), (2, \'hello\', 2)')
@@ -56,7 +56,7 @@ box.sql.execute('INSERT INTO test2 VALUES (1, \'abc\', 1), (2, \'hello\', 2)')
 box.sql.execute('INSERT INTO test2 VALUES (3, \'test\', 3), (4, \'xx\', 4)')
 ---
 ...
-box.sql.execute('SELECT a, id + 2 * a, b FROM test2 WHERE b < id * 2 ORDER BY a ')
+box.sql.execute('SELECT a, id, b FROM test2 WHERE b < id * 2 ORDER BY a ')
 ---
 - - ['abc', 1, 1]
   - ['hello', 2, 2]
diff --git a/test/sql/gh-3199-no-mem-leaks.test.lua b/test/sql/gh-3199-no-mem-leaks.test.lua
index d61d474d9..cb4ef7cb7 100644
--- a/test/sql/gh-3199-no-mem-leaks.test.lua
+++ b/test/sql/gh-3199-no-mem-leaks.test.lua
@@ -8,7 +8,7 @@ fiber = require('fiber')
 -- box.cfg()
 
 
-box.sql.execute('CREATE TABLE test (id PRIMARY KEY, x INTEGER, y INTEGER)')
+box.sql.execute('CREATE TABLE test (id INT PRIMARY KEY, x INTEGER, y INTEGER)')
 box.sql.execute('INSERT INTO test VALUES (1, 1, 1), (2, 2, 2)')
 box.sql.execute('SELECT x, y, x + y FROM test ORDER BY y')
 
@@ -21,10 +21,10 @@ box.sql.execute('SELECT x, y, x + y FROM test ORDER BY y')
 
 fiber.info()[fiber.self().id()].memory.used
 
-box.sql.execute('CREATE TABLE test2 (id PRIMARY KEY, a TEXT, b INTEGER)')
+box.sql.execute('CREATE TABLE test2 (id INT PRIMARY KEY, a TEXT, b INTEGER)')
 box.sql.execute('INSERT INTO test2 VALUES (1, \'abc\', 1), (2, \'hello\', 2)')
 box.sql.execute('INSERT INTO test2 VALUES (3, \'test\', 3), (4, \'xx\', 4)')
-box.sql.execute('SELECT a, id + 2 * a, b FROM test2 WHERE b < id * 2 ORDER BY a ')
+box.sql.execute('SELECT a, id, b FROM test2 WHERE b < id * 2 ORDER BY a ')
 
 fiber.info()[fiber.self().id()].memory.used
 
diff --git a/test/sql/gh2141-delete-trigger-drop-table.result b/test/sql/gh2141-delete-trigger-drop-table.result
index ba7016c48..695dcb327 100644
--- a/test/sql/gh2141-delete-trigger-drop-table.result
+++ b/test/sql/gh2141-delete-trigger-drop-table.result
@@ -2,7 +2,7 @@ test_run = require('test_run').new()
 ---
 ...
 -- create space
-box.sql.execute("CREATE TABLE t(id PRIMARY KEY)")
+box.sql.execute("CREATE TABLE t(id int PRIMARY KEY)")
 ---
 ...
 box.sql.execute("CREATE TRIGGER tt_bu BEFORE UPDATE ON t BEGIN SELECT 1; END")
diff --git a/test/sql/gh2141-delete-trigger-drop-table.test.lua b/test/sql/gh2141-delete-trigger-drop-table.test.lua
index e6a030cb4..a2214a263 100644
--- a/test/sql/gh2141-delete-trigger-drop-table.test.lua
+++ b/test/sql/gh2141-delete-trigger-drop-table.test.lua
@@ -1,7 +1,7 @@
 test_run = require('test_run').new()
 
 -- create space
-box.sql.execute("CREATE TABLE t(id PRIMARY KEY)")
+box.sql.execute("CREATE TABLE t(id int PRIMARY KEY)")
 
 box.sql.execute("CREATE TRIGGER tt_bu BEFORE UPDATE ON t BEGIN SELECT 1; END")
 box.sql.execute("CREATE TRIGGER tt_au AFTER UPDATE ON t BEGIN SELECT 1; END")
diff --git a/test/sql/gh2251-multiple-update.result b/test/sql/gh2251-multiple-update.result
index 5372cfc3a..32e0c94db 100644
--- a/test/sql/gh2251-multiple-update.result
+++ b/test/sql/gh2251-multiple-update.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ---
 ...
 -- box.cfg()
-box.sql.execute("CREATE TABLE t1(a integer primary key, b UNIQUE, e);")
+box.sql.execute("CREATE TABLE t1(a integer primary key, b int UNIQUE, e int);")
 ---
 ...
 box.sql.execute("INSERT INTO t1 VALUES(1,4,6);")
@@ -20,7 +20,7 @@ box.sql.execute("SELECT e FROM t1")
 - - [7]
   - [8]
 ...
-box.sql.execute("CREATE TABLE t2(a integer primary key, b UNIQUE, c, d, e,  UNIQUE(c,d));")
+box.sql.execute("CREATE TABLE t2(a integer primary key, b int UNIQUE, c int, d int, e int,  UNIQUE(c,d));")
 ---
 ...
 box.sql.execute("INSERT INTO t2 VALUES(1,2,3,4,5);")
diff --git a/test/sql/gh2251-multiple-update.test.lua b/test/sql/gh2251-multiple-update.test.lua
index 15795f12b..2619bf96d 100644
--- a/test/sql/gh2251-multiple-update.test.lua
+++ b/test/sql/gh2251-multiple-update.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 
 -- box.cfg()
 
-box.sql.execute("CREATE TABLE t1(a integer primary key, b UNIQUE, e);")
+box.sql.execute("CREATE TABLE t1(a integer primary key, b int UNIQUE, e int);")
 box.sql.execute("INSERT INTO t1 VALUES(1,4,6);")
 box.sql.execute("INSERT INTO t1 VALUES(2,5,7);")
 
@@ -11,7 +11,7 @@ box.sql.execute("UPDATE t1 SET e=e+1 WHERE b IN (SELECT b FROM t1);")
 
 box.sql.execute("SELECT e FROM t1")
 
-box.sql.execute("CREATE TABLE t2(a integer primary key, b UNIQUE, c, d, e,  UNIQUE(c,d));")
+box.sql.execute("CREATE TABLE t2(a integer primary key, b int UNIQUE, c int, d int, e int,  UNIQUE(c,d));")
 box.sql.execute("INSERT INTO t2 VALUES(1,2,3,4,5);")
 box.sql.execute("INSERT INTO t2 VALUES(2,3,4,4,6);")
 
diff --git a/test/sql/gh2808-inline-unique-persistency-check.result b/test/sql/gh2808-inline-unique-persistency-check.result
index e171f7aa7..88d31d01f 100644
--- a/test/sql/gh2808-inline-unique-persistency-check.result
+++ b/test/sql/gh2808-inline-unique-persistency-check.result
@@ -6,7 +6,7 @@ test_run = env.new()
 ---
 ...
 -- Create a table and insert a datum
-box.sql.execute([[CREATE TABLE t1(a PRIMARY KEY, b, UNIQUE(b));]])
+box.sql.execute([[CREATE TABLE t1(a int PRIMARY KEY, b int, UNIQUE(b));]])
 ---
 ...
 box.sql.execute([[INSERT INTO t1 VALUES(1,2);]])
diff --git a/test/sql/gh2808-inline-unique-persistency-check.test.lua b/test/sql/gh2808-inline-unique-persistency-check.test.lua
index 19ae87760..cea449bb7 100644
--- a/test/sql/gh2808-inline-unique-persistency-check.test.lua
+++ b/test/sql/gh2808-inline-unique-persistency-check.test.lua
@@ -3,7 +3,7 @@ env = require('test_run')
 test_run = env.new()
 
 -- Create a table and insert a datum
-box.sql.execute([[CREATE TABLE t1(a PRIMARY KEY, b, UNIQUE(b));]])
+box.sql.execute([[CREATE TABLE t1(a int PRIMARY KEY, b int, UNIQUE(b));]])
 box.sql.execute([[INSERT INTO t1 VALUES(1,2);]])
 
 -- Sanity check
diff --git a/test/sql/insert-unique.result b/test/sql/insert-unique.result
index 7e564ec77..bdde9d71c 100644
--- a/test/sql/insert-unique.result
+++ b/test/sql/insert-unique.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE zoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zoobar (c1 INT, c2 INT PRIMARY KEY, c3 varchar(10), c4 int)")
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zoobar(c1, c4)")
diff --git a/test/sql/insert-unique.test.lua b/test/sql/insert-unique.test.lua
index dfdaa30cc..4ca784ef2 100644
--- a/test/sql/insert-unique.test.lua
+++ b/test/sql/insert-unique.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE zoobar (c1, c2 PRIMARY KEY, c3, c4)")
+box.sql.execute("CREATE TABLE zoobar (c1 INT, c2 INT PRIMARY KEY, c3 varchar(10), c4 int)")
 box.sql.execute("CREATE UNIQUE INDEX zoobar2 ON zoobar(c1, c4)")
 
 -- Debug
diff --git a/test/sql/iproto.result b/test/sql/iproto.result
index 39e51d84c..dc5f97142 100644
--- a/test/sql/iproto.result
+++ b/test/sql/iproto.result
@@ -1,7 +1,7 @@
 remote = require('net.box')
 ---
 ...
-box.sql.execute('create table test (id primary key, a float, b text)')
+box.sql.execute('create table test (id int primary key, a float, b text)')
 ---
 ...
 space = box.space.TEST
@@ -282,7 +282,7 @@ cn:execute('select :value', parameters)
 - error: Bind value type MAP for parameter ':value' is not supported
 ...
 -- gh-2608 SQL iproto DDL
-cn:execute('create table test2(id primary key, a, b, c)')
+cn:execute('create table test2(id int primary key, a decimal, b int, c decimal)')
 ---
 - rowcount: 1
 ...
@@ -318,7 +318,7 @@ box.space.TEST2
 ...
 -- gh-2617 DDL row_count either 0 or 1.
 -- Test CREATE [IF NOT EXISTS] TABLE.
-cn:execute('create table test3(id primary key, a, b)')
+cn:execute('create table test3(id int primary key, a int, b int)')
 ---
 - rowcount: 1
 ...
diff --git a/test/sql/iproto.test.lua b/test/sql/iproto.test.lua
index faf844226..ea50343c9 100644
--- a/test/sql/iproto.test.lua
+++ b/test/sql/iproto.test.lua
@@ -1,6 +1,6 @@
 remote = require('net.box')
 
-box.sql.execute('create table test (id primary key, a float, b text)')
+box.sql.execute('create table test (id int primary key, a float, b text)')
 space = box.space.TEST
 space:replace{1, 2, '3'}
 space:replace{4, 5, '6'}
@@ -110,7 +110,7 @@ parameters[1][':value'] = {kek = 300}
 cn:execute('select :value', parameters)
 
 -- gh-2608 SQL iproto DDL
-cn:execute('create table test2(id primary key, a, b, c)')
+cn:execute('create table test2(id int primary key, a decimal, b int, c decimal)')
 box.space.TEST2.name
 cn:execute('insert into test2 values (1, 1, 1, 1)')
 cn:execute('select * from test2')
@@ -122,7 +122,7 @@ box.space.TEST2
 -- gh-2617 DDL row_count either 0 or 1.
 
 -- Test CREATE [IF NOT EXISTS] TABLE.
-cn:execute('create table test3(id primary key, a, b)')
+cn:execute('create table test3(id int primary key, a int, b int)')
 -- Rowcount = 1, although two tuples were created:
 -- for _space and for _index.
 cn:execute('insert into test3 values (1, 1, 1), (2, 2, 2), (3, 3, 3)')
diff --git a/test/sql/max-on-index.result b/test/sql/max-on-index.result
index afd43628b..ea6aff29a 100644
--- a/test/sql/max-on-index.result
+++ b/test/sql/max-on-index.result
@@ -4,7 +4,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 -- create space
 -- scalar affinity
-box.sql.execute("CREATE TABLE test1 (f1, f2 INT, PRIMARY KEY(f1))")
+box.sql.execute("CREATE TABLE test1 (f1 INT, f2 INT, PRIMARY KEY(f1))")
 ---
 ...
 box.sql.execute("CREATE INDEX test1_index ON test1 (f2)")
diff --git a/test/sql/max-on-index.test.lua b/test/sql/max-on-index.test.lua
index 5ce6cd70a..9681ea015 100644
--- a/test/sql/max-on-index.test.lua
+++ b/test/sql/max-on-index.test.lua
@@ -4,7 +4,7 @@ test_run = require('test_run').new()
 
 -- create space
 -- scalar affinity
-box.sql.execute("CREATE TABLE test1 (f1, f2 INT, PRIMARY KEY(f1))")
+box.sql.execute("CREATE TABLE test1 (f1 INT, f2 INT, PRIMARY KEY(f1))")
 box.sql.execute("CREATE INDEX test1_index ON test1 (f2)")
 
 -- integer affinity
diff --git a/test/sql/misc.result b/test/sql/misc.result
index b1ddb89a1..fa8709775 100644
--- a/test/sql/misc.result
+++ b/test/sql/misc.result
@@ -7,7 +7,7 @@ box.sql.execute('select 1; select 2;')
 ---
 - error: keyword "select" is reserved
 ...
-box.sql.execute('create table t1 (id primary key); select 100;')
+box.sql.execute('create table t1 (id int primary key); select 100;')
 ---
 - error: keyword "select" is reserved
 ...
diff --git a/test/sql/misc.test.lua b/test/sql/misc.test.lua
index 2c05fcd0c..59821cc6f 100644
--- a/test/sql/misc.test.lua
+++ b/test/sql/misc.test.lua
@@ -1,7 +1,7 @@
 -- Forbid multistatement queries.
 box.sql.execute('select 1;')
 box.sql.execute('select 1; select 2;')
-box.sql.execute('create table t1 (id primary key); select 100;')
+box.sql.execute('create table t1 (id int primary key); select 100;')
 box.space.t1 == nil
 box.sql.execute(';')
 box.sql.execute('')
diff --git a/test/sql/persistency.result b/test/sql/persistency.result
index 7a7f6b82a..3e2e3de54 100644
--- a/test/sql/persistency.result
+++ b/test/sql/persistency.result
@@ -5,7 +5,7 @@ test_run = env.new()
 ---
 ...
 -- create space
-box.sql.execute("CREATE TABLE foobar (foo PRIMARY KEY, bar)")
+box.sql.execute("CREATE TABLE foobar (foo int PRIMARY KEY, bar text)")
 ---
 ...
 -- prepare data
@@ -120,7 +120,7 @@ box.sql.execute("SELECT COUNT(*) FROM foobar WHERE bar='cacodaemon'")
 ...
 -- multi-index
 -- create space
-box.sql.execute("CREATE TABLE barfoo (bar, foo NUM PRIMARY KEY)")
+box.sql.execute("CREATE TABLE barfoo (bar int, foo NUMERIC PRIMARY KEY)")
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX barfoo2 ON barfoo(bar)")
@@ -145,7 +145,7 @@ box.sql.execute("SELECT * FROM \"_trigger\"");
 - - ['TFOOBAR', !!binary gaNzcWzZaUNSRUFURSBUUklHR0VSIHRmb29iYXIgQUZURVIgSU5TRVJUIE9OIGZvb2JhciBCRUdJTiBJTlNFUlQgSU5UTyBiYXJmb28gVkFMVUVTICgndHJpZ2dlciB0ZXN0JywgOTk5OSk7IEVORA==]
 ...
 -- Many entries
-box.sql.execute("CREATE TABLE t1(a,b,c,PRIMARY KEY(b,c));")
+box.sql.execute("CREATE TABLE t1(a INT,b INT,c INT,PRIMARY KEY(b,c));")
 ---
 ...
 box.sql.execute("WITH RECURSIVE cnt(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM cnt WHERE x<1000) INSERT INTO t1 SELECT x, x%40, x/40 FROM cnt;")
@@ -171,7 +171,7 @@ box.sql.execute("SELECT * FROM \"_trigger\"");
 - - ['TFOOBAR', !!binary gaNzcWzZaUNSRUFURSBUUklHR0VSIHRmb29iYXIgQUZURVIgSU5TRVJUIE9OIGZvb2JhciBCRUdJTiBJTlNFUlQgSU5UTyBiYXJmb28gVkFMVUVTICgndHJpZ2dlciB0ZXN0JywgOTk5OSk7IEVORA==]
 ...
 -- ... functional
-box.sql.execute("INSERT INTO foobar VALUES ('foobar trigger test', 8888)")
+box.sql.execute("INSERT INTO foobar VALUES (8888, 'foobar trigger test')")
 ---
 ...
 box.sql.execute("SELECT * FROM barfoo WHERE foo = 9999");
@@ -214,7 +214,7 @@ box.sql.execute("SELECT * FROM foobar");
 ---
 - - [2, 'bar']
   - [1000, 'foobar']
-  - ['foobar trigger test', 8888]
+  - [8888, 'foobar trigger test']
 ...
 box.sql.execute("SELECT a FROM t1 ORDER BY b, a LIMIT 10 OFFSET 20;");
 ---
diff --git a/test/sql/persistency.test.lua b/test/sql/persistency.test.lua
index bd055457b..fb8c37e21 100644
--- a/test/sql/persistency.test.lua
+++ b/test/sql/persistency.test.lua
@@ -2,7 +2,7 @@ env = require('test_run')
 test_run = env.new()
 
 -- create space
-box.sql.execute("CREATE TABLE foobar (foo PRIMARY KEY, bar)")
+box.sql.execute("CREATE TABLE foobar (foo int PRIMARY KEY, bar text)")
 
 -- prepare data
 box.sql.execute("INSERT INTO foobar VALUES (1, 'foo')")
@@ -39,7 +39,7 @@ box.sql.execute("SELECT COUNT(*) FROM foobar WHERE bar='cacodaemon'")
 -- multi-index
 
 -- create space
-box.sql.execute("CREATE TABLE barfoo (bar, foo NUM PRIMARY KEY)")
+box.sql.execute("CREATE TABLE barfoo (bar int, foo NUMERIC PRIMARY KEY)")
 box.sql.execute("CREATE UNIQUE INDEX barfoo2 ON barfoo(bar)")
 
 -- prepare data
@@ -52,7 +52,7 @@ box.sql.execute("CREATE TRIGGER tfoobar AFTER INSERT ON foobar BEGIN INSERT INTO
 box.sql.execute("SELECT * FROM \"_trigger\"");
 
 -- Many entries
-box.sql.execute("CREATE TABLE t1(a,b,c,PRIMARY KEY(b,c));")
+box.sql.execute("CREATE TABLE t1(a INT,b INT,c INT,PRIMARY KEY(b,c));")
 box.sql.execute("WITH RECURSIVE cnt(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM cnt WHERE x<1000) INSERT INTO t1 SELECT x, x%40, x/40 FROM cnt;")
 box.sql.execute("SELECT a FROM t1 ORDER BY b, a LIMIT 10 OFFSET 20;");
 
@@ -62,7 +62,7 @@ test_run:cmd('restart server default');
 box.sql.execute("SELECT * FROM \"_trigger\"");
 
 -- ... functional
-box.sql.execute("INSERT INTO foobar VALUES ('foobar trigger test', 8888)")
+box.sql.execute("INSERT INTO foobar VALUES (8888, 'foobar trigger test')")
 box.sql.execute("SELECT * FROM barfoo WHERE foo = 9999");
 
 -- and still persistent
diff --git a/test/sql/select-null.result b/test/sql/select-null.result
index a229eb93b..b2dac09c2 100644
--- a/test/sql/select-null.result
+++ b/test/sql/select-null.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE t3(id INT, a, b, PRIMARY KEY(id))")
+box.sql.execute("CREATE TABLE t3(id INT, a text, b text, PRIMARY KEY(id))")
 ---
 ...
 -- Debug
diff --git a/test/sql/select-null.test.lua b/test/sql/select-null.test.lua
index a2c126614..95ac1eb4a 100644
--- a/test/sql/select-null.test.lua
+++ b/test/sql/select-null.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE t3(id INT, a, b, PRIMARY KEY(id))")
+box.sql.execute("CREATE TABLE t3(id INT, a text, b text, PRIMARY KEY(id))")
 
 -- Debug
 -- box.sql.execute("PRAGMA vdbe_debug=ON ; INSERT INTO zoobar VALUES (111, 222, 'c3', 444)")
diff --git a/test/sql/transition.result b/test/sql/transition.result
index 7c4a2c813..16f461d33 100644
--- a/test/sql/transition.result
+++ b/test/sql/transition.result
@@ -1,5 +1,5 @@
 -- create space
-box.sql.execute("CREATE TABLE foobar (foo PRIMARY KEY, bar)")
+box.sql.execute("CREATE TABLE foobar (foo int PRIMARY KEY, bar text)")
 ---
 ...
 -- prepare data
@@ -114,7 +114,7 @@ box.sql.execute("SELECT COUNT(*) FROM foobar WHERE bar='cacodaemon'")
 ...
 -- multi-index
 -- create space
-box.sql.execute("CREATE TABLE barfoo (bar, foo NUM PRIMARY KEY)")
+box.sql.execute("CREATE TABLE barfoo (bar text, foo NUMERIC PRIMARY KEY)")
 ---
 ...
 box.sql.execute("CREATE UNIQUE INDEX barfoo2 ON barfoo(bar)")
@@ -171,17 +171,17 @@ box.sql.execute("DROP TABLE barfoo")
 ---
 ...
 -- attempt to create a table lacking PRIMARY KEY
-box.sql.execute("CREATE TABLE without_rowid_lacking_primary_key(x)")
+box.sql.execute("CREATE TABLE without_rowid_lacking_primary_key(x int)")
 ---
 - error: PRIMARY KEY missing on table WITHOUT_ROWID_LACKING_PRIMARY_KEY
 ...
 -- attempt to create a table lacking WITHOUT ROWID clause
-box.sql.execute("CREATE TABLE rowid(x)")
+box.sql.execute("CREATE TABLE rowid(x int)")
 ---
 - error: PRIMARY KEY missing on table ROWID
 ...
 -- create a table with implicit indices (used to SEGFAULT)
-box.sql.execute("CREATE TABLE implicit_indices(a PRIMARY KEY,b,c,d UNIQUE)")
+box.sql.execute("CREATE TABLE implicit_indices(a int PRIMARY KEY,b int,c int,d int UNIQUE)")
 ---
 ...
 box.sql.execute("DROP TABLE implicit_indices")
diff --git a/test/sql/transition.test.lua b/test/sql/transition.test.lua
index 50ee7f569..845a8b7d5 100644
--- a/test/sql/transition.test.lua
+++ b/test/sql/transition.test.lua
@@ -1,5 +1,5 @@
 -- create space
-box.sql.execute("CREATE TABLE foobar (foo PRIMARY KEY, bar)")
+box.sql.execute("CREATE TABLE foobar (foo int PRIMARY KEY, bar text)")
 
 -- prepare data
 box.sql.execute("INSERT INTO foobar VALUES (1, 'foo')")
@@ -36,7 +36,7 @@ box.sql.execute("SELECT COUNT(*) FROM foobar WHERE bar='cacodaemon'")
 -- multi-index
 
 -- create space
-box.sql.execute("CREATE TABLE barfoo (bar, foo NUM PRIMARY KEY)")
+box.sql.execute("CREATE TABLE barfoo (bar text, foo NUMERIC PRIMARY KEY)")
 box.sql.execute("CREATE UNIQUE INDEX barfoo2 ON barfoo(bar)")
 
 -- prepare data
@@ -59,11 +59,11 @@ box.sql.execute("DROP TABLE foobar")
 box.sql.execute("DROP TABLE barfoo")
 
 -- attempt to create a table lacking PRIMARY KEY
-box.sql.execute("CREATE TABLE without_rowid_lacking_primary_key(x)")
+box.sql.execute("CREATE TABLE without_rowid_lacking_primary_key(x int)")
 
 -- attempt to create a table lacking WITHOUT ROWID clause
-box.sql.execute("CREATE TABLE rowid(x)")
+box.sql.execute("CREATE TABLE rowid(x int)")
 
 -- create a table with implicit indices (used to SEGFAULT)
-box.sql.execute("CREATE TABLE implicit_indices(a PRIMARY KEY,b,c,d UNIQUE)")
+box.sql.execute("CREATE TABLE implicit_indices(a int PRIMARY KEY,b int,c int,d int UNIQUE)")
 box.sql.execute("DROP TABLE implicit_indices")
diff --git a/test/sql/update-with-nested-select.result b/test/sql/update-with-nested-select.result
index 419cebb61..64a4fb656 100644
--- a/test/sql/update-with-nested-select.result
+++ b/test/sql/update-with-nested-select.result
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 ...
 -- box.cfg()
 -- create space
-box.sql.execute("CREATE TABLE t1(a integer primary key, b UNIQUE, e);");
+box.sql.execute("CREATE TABLE t1(a integer primary key, b int UNIQUE, e int);");
 ---
 ...
 -- Debug
diff --git a/test/sql/update-with-nested-select.test.lua b/test/sql/update-with-nested-select.test.lua
index 7b90968ae..9421a3b52 100644
--- a/test/sql/update-with-nested-select.test.lua
+++ b/test/sql/update-with-nested-select.test.lua
@@ -3,7 +3,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- create space
-box.sql.execute("CREATE TABLE t1(a integer primary key, b UNIQUE, e);");
+box.sql.execute("CREATE TABLE t1(a integer primary key, b int UNIQUE, e int);");
 
 -- Debug
 -- box.sql.execute("PRAGMA vdbe_debug=ON ; INSERT INTO zoobar VALUES (111, 222, 'c3', 444)")
diff --git a/test/sql/view.result b/test/sql/view.result
index 04cb3fae8..b5b7fe56e 100644
--- a/test/sql/view.result
+++ b/test/sql/view.result
@@ -4,7 +4,7 @@ test_run = require('test_run').new()
 -- Verify that constraints on 'view' option are working.
 -- box.cfg()
 -- Create space and view.
-box.sql.execute("CREATE TABLE t1(a, b, PRIMARY KEY(a, b));");
+box.sql.execute("CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));");
 ---
 ...
 box.sql.execute("CREATE VIEW v1 AS SELECT a+b FROM t1;");
diff --git a/test/sql/view.test.lua b/test/sql/view.test.lua
index ab2843cb6..f0f9fac59 100644
--- a/test/sql/view.test.lua
+++ b/test/sql/view.test.lua
@@ -5,7 +5,7 @@ test_run = require('test_run').new()
 -- box.cfg()
 
 -- Create space and view.
-box.sql.execute("CREATE TABLE t1(a, b, PRIMARY KEY(a, b));");
+box.sql.execute("CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));");
 box.sql.execute("CREATE VIEW v1 AS SELECT a+b FROM t1;");
 
 -- View can't have any indexes.
-- 
2.17.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tarantool-patches] Re: [PATCH 2/2] Fix some sql tests against static types
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 2/2] Fix some sql tests against static types Georgy Kirichenko
@ 2018-04-19  9:20   ` Vladislav Shpilevoy
  0 siblings, 0 replies; 5+ messages in thread
From: Vladislav Shpilevoy @ 2018-04-19  9:20 UTC (permalink / raw)
  To: tarantool-patches, Georgy Kirichenko

LGTM.

On 19/04/2018 12:15, Georgy Kirichenko wrote:
> Update sql tests
> Issue #3102
> ---
>   test/sql/check-clear-ephemeral.result                  |  2 +-
>   test/sql/check-clear-ephemeral.test.lua                |  2 +-
>   test/sql/clear.result                                  |  2 +-
>   test/sql/clear.test.lua                                |  2 +-
>   test/sql/delete-multiple-idx.result                    |  2 +-
>   test/sql/delete-multiple-idx.test.lua                  |  2 +-
>   test/sql/delete.result                                 |  2 +-
>   test/sql/delete.test.lua                               |  2 +-
>   test/sql/drop-index.result                             |  2 +-
>   test/sql/drop-index.test.lua                           |  2 +-
>   test/sql/drop-table.result                             |  2 +-
>   test/sql/drop-table.test.lua                           |  2 +-
>   test/sql/errinj.result                                 |  2 +-
>   test/sql/errinj.test.lua                               |  2 +-
>   test/sql/gh-2929-primary-key.result                    | 10 +++++-----
>   test/sql/gh-2929-primary-key.test.lua                  | 10 +++++-----
>   test/sql/gh-3199-no-mem-leaks.result                   |  6 +++---
>   test/sql/gh-3199-no-mem-leaks.test.lua                 |  6 +++---
>   test/sql/gh2141-delete-trigger-drop-table.result       |  2 +-
>   test/sql/gh2141-delete-trigger-drop-table.test.lua     |  2 +-
>   test/sql/gh2251-multiple-update.result                 |  4 ++--
>   test/sql/gh2251-multiple-update.test.lua               |  4 ++--
>   test/sql/gh2808-inline-unique-persistency-check.result |  2 +-
>   .../gh2808-inline-unique-persistency-check.test.lua    |  2 +-
>   test/sql/insert-unique.result                          |  2 +-
>   test/sql/insert-unique.test.lua                        |  2 +-
>   test/sql/iproto.result                                 |  6 +++---
>   test/sql/iproto.test.lua                               |  6 +++---
>   test/sql/max-on-index.result                           |  2 +-
>   test/sql/max-on-index.test.lua                         |  2 +-
>   test/sql/misc.result                                   |  2 +-
>   test/sql/misc.test.lua                                 |  2 +-
>   test/sql/persistency.result                            | 10 +++++-----
>   test/sql/persistency.test.lua                          |  8 ++++----
>   test/sql/select-null.result                            |  2 +-
>   test/sql/select-null.test.lua                          |  2 +-
>   test/sql/transition.result                             | 10 +++++-----
>   test/sql/transition.test.lua                           | 10 +++++-----
>   test/sql/update-with-nested-select.result              |  2 +-
>   test/sql/update-with-nested-select.test.lua            |  2 +-
>   test/sql/view.result                                   |  2 +-
>   test/sql/view.test.lua                                 |  2 +-
>   42 files changed, 75 insertions(+), 75 deletions(-)
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tarantool-patches] Re: [PATCH 1/2] Convert some tests into a static-types form.
  2018-04-19  9:15 ` [tarantool-patches] [PATCH 1/2] Convert some tests into a static-types form Georgy Kirichenko
@ 2018-04-19  9:26   ` Vladislav Shpilevoy
  0 siblings, 0 replies; 5+ messages in thread
From: Vladislav Shpilevoy @ 2018-04-19  9:26 UTC (permalink / raw)
  To: tarantool-patches, Georgy Kirichenko


> diff --git a/test/sql-tap/table.test.lua b/test/sql-tap/table.test.lua
> index 6e1056193..a4a40747b 100755
> --- a/test/sql-tap/table.test.lua
> +++ b/test/sql-tap/table.test.lua
> @@ -317,7 +317,7 @@ test:do_test(
>       "table-4.1",
>       function()
>           for i = 1, 100, 1 do
> -            local sql = "CREATE TABLE "..string.format("test%03d", i).." (id primary key, "
> +            local INT sql = "CREATE TABLE "..string.format("test%03d", i).." (id INT primary key,  "

Hello. 'local INT sql' - typo? Lua has no types.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-04-19  9:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-19  9:15 [tarantool-patches] [PATCH 0/2] Update some sql tests against static types Georgy Kirichenko
2018-04-19  9:15 ` [tarantool-patches] [PATCH 1/2] Convert some tests into a static-types form Georgy Kirichenko
2018-04-19  9:26   ` [tarantool-patches] " Vladislav Shpilevoy
2018-04-19  9:15 ` [tarantool-patches] [PATCH 2/2] Fix some sql tests against static types Georgy Kirichenko
2018-04-19  9:20   ` [tarantool-patches] " Vladislav Shpilevoy

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