Fix pg driver int64 convertation. Issue #6

tarantool · Feb 11, 2016 · 9e3e626 · 9e3e626
1 parent c56397e
commit 9e3e626
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pg/driver.c b/pg/driver.c
@@ -140,14 +140,18 @@ lua_pg_pushresult(struct lua_State *L, PGresult *r)
 			switch (PQftype(r, j)) {
 				case INT2OID:
 				case INT4OID:
-				case INT8OID:
 				case NUMERICOID: {
 					lua_pushlstring(L, s, len);
 					double v = lua_tonumber(L, -1);
 					lua_pop(L, 1);
 					lua_pushnumber(L, v);
 					break;
 				}
+				case INT8OID: {
+					long long v = strtoll(s, NULL, 0);
+					luaL_pushint64(L, v);
+					break;
+				}
 				case BOOLOID:
 					if (*s == 't' || *s == 'T')
 						lua_pushboolean(L, 1);

diff --git a/test/pg.test.lua b/test/pg.test.lua
@@ -7,7 +7,7 @@ local pg = require('pg')
 local json = require('json')
 
 require('tap').test('pg', function(t)
-    t:plan(16)
+    t:plan(17)
     local host, port, user, pass, db = string.match(os.getenv('PG') or '',
         "([^:]*):([^:]*):([^:]*):([^:]*):([^:]*)")
 
@@ -59,5 +59,9 @@ require('tap').test('pg', function(t)
     t:q('DROP TABLE IF EXISTS unknown_table', {})
     local tuples, reason = c:execute('DROP TABLE unknown_table')
     t:like(reason, 'unknown_table', 'error')
+    c:execute('CREATE TABLE int64test (id BIGINT)')
+    c:execute('INSERT INTO int64test VALUES(1234567890123456789)')
+    t:q('SELECT id FROM int64test', {{ id = 1234567890123456789LL}})
+    c:execute('drop table int64test')
     t:ok(c:close(), "close")
 end)