Merge branch 'test-runner'

test/box/sql.result

@@ -53,3 +53,23 @@ Insert OK, 1 row affected
 select * from t0 where k0 = 1
 Found 1 tuple:
 [1, 'Huh', 'Oh-ho-ho']
+update t0 set k1 = "", k2 = "" where k0=1
+Insert OK, 1 row affected
+select * from t0 where k0 = 1
+Found 1 tuple:
+[1, '', '']
+update t0 set k1 = 2, k2 = 3 where k0=1
+Insert OK, 1 row affected
+select * from t0 where k0 = 1
+Found 1 tuple:
+[1, 2, 3]
+insert into t0 values (0)
+Insert OK, 1 row affected
+select * from t0 where k0=0
+Found 1 tuple:
+[0]
+insert into t0 values (4294967295)
+Insert OK, 1 row affected
+select * from t0 where k0=4294967295
+Found 1 tuple:
+[4294967295]

test/box/sql.test

@@ -28,5 +28,16 @@ exec sql 'select * from t0 where k0 = 1'
 exec sql 'insert into t0 values (1, "I am a new tuple", "stub")'
 exec sql 'update t0 set k1 = "Huh", k2 = "Oh-ho-ho" where k0=1'
 exec sql 'select * from t0 where k0 = 1'
+# check empty strings
+exec sql 'update t0 set k1 = "", k2 = "" where k0=1'
+exec sql 'select * from t0 where k0 = 1'
+# check type change 
+exec sql 'update t0 set k1 = 2, k2 = 3 where k0=1'
+exec sql 'select * from t0 where k0 = 1'
+# check limits
+exec sql 'insert into t0 values (0)'
+exec sql 'select * from t0 where k0=0'
+exec sql 'insert into t0 values (4294967295)'
+exec sql 'select * from t0 where k0=4294967295'
 
 # vim: syntax=python

test/lib/sql.g

@@ -8,7 +8,7 @@ object_no_re = re.compile("[a-z_]*", re.I)
 parser sql:
 
     ignore:           '\\s+'
-    token NUM:        '[0-9]+'
+    token NUM:        '[+-]?[0-9]+'
     token ID:         '[a-z_]+[0-9]+' 
     token STR:        '"([^\\"]+|\\\\.)*"'
     token PING:       'ping'

test/lib/sql.py

@@ -17,7 +17,7 @@ class sqlScanner(runtime.Scanner):
         ("'='", re.compile('=')),
         ("'\\*'", re.compile('\\*')),
         ('\\s+', re.compile('\\s+')),
-        ('NUM', re.compile('[0-9]+')),
+        ('NUM', re.compile('[+-]?[0-9]+')),
         ('ID', re.compile('[a-z_]+[0-9]+')),
         ('STR', re.compile('"([^\\"]+|\\\\.)*"')),
         ('PING', re.compile('ping')),