lua compatibility fixes

fixes affected_rows always nil on Lua 5.2+ fixes tests always failing on Lua 5.2+
leafo · Nov 23, 2020 · ff188f9 · ff188f9
1 parent e14ba4c
commit ff188f9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pgmoon/init.lua b/pgmoon/init.lua
@@ -362,7 +362,7 @@ do
  local command, affected_rows
  if command_complete then
  command = command_complete:match("^%w+")
- affected_rows = tonumber(command_complete:match("%d+%z$"))
+ affected_rows = tonumber(command_complete:match("(%d+)%z$"))
  end
  if row_desc then
  if not (data_rows) then

diff --git a/pgmoon/init.moon b/pgmoon/init.moon
@@ -330,7 +330,7 @@ class Postgres
 
  if command_complete
  command = command_complete\match "^%w+"
- affected_rows = tonumber command_complete\match "%d+%z$"
+ affected_rows = tonumber command_complete\match "(%d+)%z$"
 
  if row_desc
  return {} unless data_rows

diff --git a/spec/pgmoon_spec.moon b/spec/pgmoon_spec.moon
@@ -23,8 +23,11 @@ describe "pgmoon with server", ->
  local pg
 
  setup ->
- assert 0 == os.execute "dropdb -h '#{HOST}' -p '#{PORT}' --if-exists -U '#{USER}' '#{DB}'"
- assert 0 == os.execute "createdb -h '#{HOST}' -p '#{PORT}' -U '#{USER}' '#{DB}'"
+ r = { os.execute "dropdb -h '#{HOST}' -p '#{PORT}' --if-exists -U '#{USER}' '#{DB}'" }
+ assert 0 == r[#r]
+
+ r = { os.execute "createdb -h '#{HOST}' -p '#{PORT}' -U '#{USER}' '#{DB}'" }
+ assert 0 == r[#r]
 
  pg = Postgres {
  database: DB