diff -pruN 2.6.0-3/Makefile 2.7.0-1/Makefile --- 2.6.0-3/Makefile 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/Makefile 2025-04-23 23:51:04.000000000 +0000 @@ -1,4 +1,4 @@ -V= 2.6.0 +V= 2.7.0 CONFIG= ./config include $(CONFIG) @@ -16,7 +16,7 @@ SPACE= $(EMPTY) $(EMPTY) all : @echo "usage: make { $(subst $(SPACE),$(SPACE)|$(SPACE),$(DRIVER_LIST)) }" -# explicity matches against the list of avilable driver names +# explicitly matches against the list of available driver names $(DRIVER_LIST) : % : src/%.so # builds the specified driver diff -pruN 2.6.0-3/README 2.7.0-1/README --- 2.6.0-3/README 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/README 2025-04-23 23:51:04.000000000 +0000 @@ -1,13 +1,13 @@ LuaSQL -http://keplerproject.github.io/luasql +https://lunarmodules.github.io/luasql/ LuaSQL is a simple interface from Lua to a DBMS. It enables a Lua program to: - * Connect to ODBC, ADO, Oracle, MySQL, SQLite, Firebird and PostgreSQL databases; + * Connect to ODBC, ADO, Oracle, MySQL, SQLite, Firebird and PostgreSQL databases; * Execute arbitrary SQL statements; * Retrieve results in a row-by-row cursor fashion. -LuaSQL is free software and uses the same license as Lua 5.1. +LuaSQL is free software and uses the same license as Lua 5.1. Source code for LuaSQL can be downloaded from its GitHub repository. diff -pruN 2.6.0-3/config 2.7.0-1/config --- 2.6.0-3/config 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/config 2025-04-23 23:51:04.000000000 +0000 @@ -46,9 +46,8 @@ DRIVER_LIBS_firebird ?= -L/usr/local/fir DRIVER_INCS_firebird ?= # general compilation parameters -WARN = -Wall -Wmissing-prototypes -Wmissing-declarations -pedantic +WARN= -fPIC $(OPTFLAGS) -Wmissing-prototypes -Wmissing-declarations -ansi -pedantic INCS = -I$(LUA_INC) -DEFS = -CFLAGS = -O2 -std=gnu99 $(WARN) -fPIC $(DRIVER_INCS) $(INCS) \ - -DLUASQL_VERSION_NUMBER='"$V"' $(DEFS) +DEFS = -std=gnu99 -fPIC +CFLAGS=$(WARN) $(DRIVER_INCS) $(INCS) -DLUASQL_VERSION_NUMBER='"$V"' $(DEFS) CC= gcc diff -pruN 2.6.0-3/debian/changelog 2.7.0-1/debian/changelog --- 2.6.0-3/debian/changelog 2024-08-12 09:08:53.000000000 +0000 +++ 2.7.0-1/debian/changelog 2025-08-15 10:52:03.000000000 +0000 @@ -1,3 +1,13 @@ +lua-sql (2.7.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release (closes: #1063730). + * Refresh patches. + * Add a patch from upstream which implements missing cur_gc function + in ls_odbc.c. + + -- Sergei Golovan Fri, 15 Aug 2025 13:52:03 +0300 + lua-sql (2.6.0-3) unstable; urgency=medium * Team upload. diff -pruN 2.6.0-3/debian/patches/0001-doc-br-remove-img-link-to-w3.org-validator-icon.patch 2.7.0-1/debian/patches/0001-doc-br-remove-img-link-to-w3.org-validator-icon.patch --- 2.6.0-3/debian/patches/0001-doc-br-remove-img-link-to-w3.org-validator-icon.patch 2024-08-12 09:08:53.000000000 +0000 +++ 2.7.0-1/debian/patches/0001-doc-br-remove-img-link-to-w3.org-validator-icon.patch 2025-08-15 10:52:03.000000000 +0000 @@ -10,24 +10,20 @@ Subject: doc/br: remove img link to w3.o doc/br/manual.html | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) -diff --git a/doc/br/examples.html b/doc/br/examples.html -index cc4ecc1..4edd1eb 100644 --- a/doc/br/examples.html +++ b/doc/br/examples.html -@@ -155,7 +155,7 @@ se ainda existem mais linhas).

+@@ -146,7 +146,7 @@
-

Valid XHTML 1.0!

+

Valid XHTML 1.0!

-

- $Id: examples.html,v 1.7 2008/06/11 00:26:13 jasonsantos Exp $ -

-diff --git a/doc/br/history.html b/doc/br/history.html -index 4ad4642..b36addc 100644 +
+ + --- a/doc/br/history.html +++ b/doc/br/history.html -@@ -118,8 +118,7 @@ na implementação em relação à versão 1 +@@ -112,8 +112,7 @@
@@ -37,11 +33,9 @@ index 4ad4642..b36addc 100644

$Id: history.html,v 1.11 2008/06/11 00:26:13 jasonsantos Exp $

-diff --git a/doc/br/index.html b/doc/br/index.html -index c7019be..47b998a 100644 --- a/doc/br/index.html +++ b/doc/br/index.html -@@ -150,8 +150,7 @@ e usuários da plataforma Kepler. +@@ -152,8 +152,7 @@
@@ -51,24 +45,20 @@ index c7019be..47b998a 100644

$Id: index.html,v 1.9 2008/06/11 00:26:13 jasonsantos Exp $

-diff --git a/doc/br/license.html b/doc/br/license.html -index 085b71f..5d8a2b2 100644 --- a/doc/br/license.html +++ b/doc/br/license.html -@@ -112,7 +112,7 @@ THE SOFTWARE.

+@@ -112,7 +112,7 @@
-

Valid XHTML 1.0!

+

Valid XHTML 1.0!

- $Id: license.html,v 1.6 2008/06/11 00:26:13 jasonsantos Exp $

-diff --git a/doc/br/manual.html b/doc/br/manual.html -index d2a3af9..7c99fd0 100644 +
--- a/doc/br/manual.html +++ b/doc/br/manual.html -@@ -395,7 +395,7 @@ o driver para SQLite3 ainda oferece uma funcionalidade adicional:

+@@ -393,7 +393,7 @@
diff -pruN 2.6.0-3/debian/patches/0002-correct-parameter-types-to-fix-ftbfs.patch 2.7.0-1/debian/patches/0002-correct-parameter-types-to-fix-ftbfs.patch --- 2.6.0-3/debian/patches/0002-correct-parameter-types-to-fix-ftbfs.patch 2024-08-12 09:08:53.000000000 +0000 +++ 2.7.0-1/debian/patches/0002-correct-parameter-types-to-fix-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Marko Lindqvist -Date: Mon, 7 Feb 2022 00:02:52 +0200 -Subject: [PATCH] ls_odbc.c: Correct parameter types - Fix compiler warnings about wrong types passed as function parameters - ---- a/src/ls_odbc.c -+++ b/src/ls_odbc.c -@@ -32,11 +32,11 @@ - #define LUASQL_STATEMENT_ODBC "ODBC statement" - #define LUASQL_CURSOR_ODBC "ODBC cursor" - --/* holds data for paramter binding */ -+/* holds data for parameter binding */ - typedef struct { - SQLPOINTER buf; -- SQLINTEGER len; -- SQLINTEGER type; -+ SQLLEN len; -+ SQLLEN type; - } param_data; - - /* general form of the driver objects */ -@@ -685,7 +685,7 @@ - return create_cursor(L, -1, stmt, numcols); - } else { - /* if action has no results (e.g., UPDATE) */ -- SQLINTEGER numrows; -+ SQLLEN numrows; - if(error(SQLRowCount(stmt->hstmt, &numrows))) { - return fail(L, hSTMT, stmt->hstmt); - } -@@ -697,7 +697,7 @@ - - static int set_param(lua_State *L, stmt_data *stmt, int i, param_data *data) - { -- static SQLINTEGER cbNull = SQL_NULL_DATA; -+ static SQLLEN cbNull = SQL_NULL_DATA; - - switch(lua_type(L, -1)) { - case LUA_TNIL: { diff -pruN 2.6.0-3/debian/patches/0002-ls-odbc-implement-missing-cur-gc-function.patch 2.7.0-1/debian/patches/0002-ls-odbc-implement-missing-cur-gc-function.patch --- 2.6.0-3/debian/patches/0002-ls-odbc-implement-missing-cur-gc-function.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/debian/patches/0002-ls-odbc-implement-missing-cur-gc-function.patch 2025-08-15 10:52:03.000000000 +0000 @@ -0,0 +1,24 @@ +From: Upstream +Description: Patch adds missing cur_gc function to the ODBC code. +Last-Modified: Fri, 15 Aug 2025 13:50:25 +0300 + +--- a/src/ls_odbc.c ++++ b/src/ls_odbc.c +@@ -493,6 +493,17 @@ + } + + /* ++** Cursor object collector function ++*/ ++static int cur_gc (lua_State *L) ++{ ++ cur_data *cur = (cur_data *) luaL_checkudata (L, 1, LUASQL_CURSOR_ODBC); ++ if (cur != NULL && !(cur->closed)) ++ cur_shut(L, cur); ++ return 0; ++} ++ ++/* + ** Closes a cursor. + */ + static int cur_close (lua_State *L) diff -pruN 2.6.0-3/debian/patches/series 2.7.0-1/debian/patches/series --- 2.6.0-3/debian/patches/series 2024-08-12 09:08:53.000000000 +0000 +++ 2.7.0-1/debian/patches/series 2025-08-15 10:52:03.000000000 +0000 @@ -1,2 +1,2 @@ 0001-doc-br-remove-img-link-to-w3.org-validator-icon.patch -0002-correct-parameter-types-to-fix-ftbfs.patch +0002-ls-odbc-implement-missing-cur-gc-function.patch diff -pruN 2.6.0-3/doc/br/examples.html 2.7.0-1/doc/br/examples.html --- 2.6.0-3/doc/br/examples.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/br/examples.html 2025-04-23 23:51:04.000000000 +0000 @@ -1,8 +1,8 @@ - + - LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua + LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua @@ -15,7 +15,7 @@ LuaSQL logo
LuaSQL
-
Conectividade de banco de dados para a linguagem de programação Lua
+
Conectividade de banco de dados para a linguagem de programação Lua
@@ -24,39 +24,18 @@

LuaSQL

@@ -64,12 +43,12 @@

Exemplos

-

Abaixo, você verá um pequeno exemplo do código do uso básico da biblioteca. -Em seguida, outro exemplo mostra como criar um +

Abaixo, você verá um pequeno exemplo do código do uso básico da biblioteca. +Em seguida, outro exemplo mostra como criar um iterador sobre o resultado de uma determinada consulta.

-

Uso básico

+

Uso básico

 -- carregar o driver
 require "luasql.postgres"
@@ -87,7 +66,7 @@ res = assert (con:execute[[
 ]])
 -- adiciona alguns elementos
 list = {
-  { name="José das Couves", email="jose@couves.com", },
+  { name="José das Couves", email="jose@couves.com", },
   { name="Manoel Joaquim", email="manoel.joaquim@cafundo.com", },
   { name="Maria das Dores", email="maria@dores.com", },
 }
@@ -112,17 +91,17 @@ con:close()
 env:close()
-

O resultado desse script será:

+

O resultado desse script será:

-Nome: José das Couves, E-mail: jose@couves.com
+Nome: José das Couves, E-mail: jose@couves.com
 Nome: Manoel Joaquim, E-mail: manoel.joaquim@cafundo.com
 Nome: Maria das Dores, E-mail: maria@dores.com

Uso do iterador

-

Pode ser útil oferecer um iterador para cada registro do resultado:

+

Pode ser útil oferecer um iterador para cada registro do resultado:

 function rows (connection, sql_statement)
@@ -133,8 +112,8 @@ function rows (connection, sql_statement
 end
-

Esse iterador é usado da seguinte forma:

- +

Esse iterador é usado da seguinte forma:

+ 
 require "luasql.mysql"
 env = assert (luasql.mysql())
@@ -144,11 +123,23 @@ for id, name, address in rows (con, "sel
 end
-

A implementação acima utiliza a coleta de lixo de Lua para -fechar o cursor. Ela pode ser melhorada de modo a apresentar -mensagens de erro mais adequadas (incluindo o statement SQL por -exemplo) ou para fechar explicitamente o cursor (verificando -se ainda existem mais linhas).

+

Obviamente, o código acima só funciona se houver uma tabela chamadas contacts com as colunas apropriadas. +No final do loop o objeto cursor será automaticamente fechado pelo driver, já que todo o resultado foi recuperado.

+ +

Objetos to-be-closed

+ +

+Nota de Compatibilidade: +Variáveis To-be-closed é um recurso introduzido na versão 5.4 de Lua. Portanto, essa funcionalidade só pode ser usada se o driver LuaSQL (versão > 2.6) for compilado para a versão 5.4 ou superior de Lua. +

+ +
+function getName(db, id)
+  -- Este código requer Lua 5.4 ou superior devido ao uso de variáveis to-be-closed
+  local cur <close> = db:execute("SELECT name FROM contacts WHERE id = " .. id)
+  return cur:fetch()
+end
+
@@ -156,9 +147,6 @@ se ainda existem mais linhas).

Valid XHTML 1.0!

-

- $Id: examples.html,v 1.7 2008/06/11 00:26:13 jasonsantos Exp $ -

diff -pruN 2.6.0-3/doc/br/history.html 2.7.0-1/doc/br/history.html --- 2.6.0-3/doc/br/history.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/br/history.html 2025-04-23 23:51:04.000000000 +0000 @@ -1,8 +1,8 @@ - + - LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua + LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua @@ -16,7 +16,7 @@ LuaSQL logo
LuaSQL
-
Conectividade de banco de dados para a linguagem de programação Lua
+
Conectividade de banco de dados para a linguagem de programação Lua
@@ -25,87 +25,81 @@

LuaSQL

-

História

+

História

+
LuaSQL 2.7.0 [23/04/2025]
+
+
    +
  • Adaptação de todos os drivers para a versão 5.4 de Lua com suporte a variáveis to-be-closed
    • +
  • Padronização da implementação do método :close() para retornar false seguido de uma string quando houver objetos relacionados ainda abertos.
    • +
+
+ +
LuaSQL 2.6.1 [07/02/2024]
+
+
    +
  • Correção na compatibilidade do driver SQLite3 para versões anteriores a Lua 5.3 (agradecimento a Daniel McCarney)
    • +
+
+
2.0.2 [26/06/2006]
-
Método numrows acrescentado ao driver MySQL.
+
Método numrows acrescentado ao driver MySQL.
Adicionado um arquivo config para o makefile.
- Adicionada configuração do driver LinuxODBC.
+ Adicionada configuração do driver LinuxODBC.
Corrigiu um bug no driver SQLite (bug encontrado por Mike Petersen).
Corrigiu bugs nos drivers JDBC, OCI8 e ADO.
Testes melhorados.
- Documentação melhorada.
+ Documentação melhorada.
- +
2.0.1 [02/06/2005]
Corrigiu alguns erros relativos ao driver ODBC.
- +
2.0.0 [22/03/2005]
Novo driver ADO e corrigiu alguns erros relativos ao driver ODBC.
- +
2.0 beta 3 [23/12/2004]
Corrigiu apenas alguns pequenos erros.
- +
2.0 beta 2 [26/11/2004]
Corrigiu alguns erros e introduziu os novos drivers SQLite and JDBC. - Utiliza a + Utiliza a proposta de pacotes para Lua 5.1. Veja mais detalhes em - Instalação. + Instalação.
- +
2.0 beta [10/12/2003]

-A versão 2.0 apresenta algumas modificações no design e aprimoramentos -na implementação em relação à versão 1.0: +A versão 2.0 apresenta algumas modificações no design e aprimoramentos +na implementação em relação à versão 1.0:

diff -pruN 2.6.0-3/doc/br/index.html 2.7.0-1/doc/br/index.html --- 2.6.0-3/doc/br/index.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/br/index.html 2025-04-23 23:51:04.000000000 +0000 @@ -1,22 +1,21 @@ - + - LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua + LuaSQL: Conectividade de banco de dados para a linguagem de programação Lua -
-
-

Visão Geral

+ +

Visão Geral

+

-LuaSQL é uma interface simples entre Lua e um sistema gerenciador de banco de dados (DBMS). Ela permite que um programa Lua: +LuaSQL é uma interface simples entre Lua e um sistema gerenciador de banco de dados (DBMS). Ela permite que um programa Lua:

+
  • Conecte-se aos bancos de dados ODBC, ADO, Oracle, MySQL, SQLite, JDBC e PostgreSQL;
    • -
  • Execute comandos arbritários do SQL;
    • +
  • Execute comandos arbritários através de SQL;
  • Recupere resultados no modo linha-a-linha de um cursor SQL.

-LuaSQL é um software livre e utiliza a mesma licença -do Lua 5.0. +LuaSQL é um software livre e utiliza a mesma licença +de Lua 5.1.

Status

-

A versão LuaSQL 2.0.2 (para Lua 5.0) está disponível para -download. -

-

O driver PostgreSQL foi testado em Windows, Linux e MacOS X e é compatível com -PostgreSQL 7.x e 8.x.

-

O driver ODBC foi testado em Windows (drivers SQLServer e Microsoft Access).

-

O driver MySQL foi testado em Windows, Linux e é compatível com as versões 4.0, 4.1 e 5.0.

-

O driver Oracle foi testado em Windows e é compatível com OCI 8 API.

-

O driver SQLite foi testado em Windows e Linux e é compatível com as versões 2.x.

-

O driver JDBC foi testado em Windows com LuaJava 1.0 e JDK 1.4 (driver MySQL).

-

O driver ADO foi testado em Windows, com LuaCOM 1.3 (driver Microsoft Access).

+

+A versão LuaSQL 2.7.0 (para Lua 5.X) está disponível para download. +Para mais detalhes sobre as funcionalidades de cada versão, confira o histórico. +

Download

-LuaSQL pode ser instalado via LuaRocks, usando -o driver do seu banco de dados escolhido: +LuaSQL pode ser instalado via LuaRocks, usando +o driver do banco de dados de sua escolha: -

-luarocks install luasql-sqlite3
-luarocks install luasql-postgres
+
+luarocks install luasql-firebird
 luarocks install luasql-mysql
-luarocks install luasql-sqlite
+luarocks install luasql-oci8
 luarocks install luasql-odbc
+luarocks install luasql-postgres
+luarocks install luasql-sqlite
+luarocks install luasql-sqlite3
 

 
-O código fonte do LuaSQL pode ser baixado do seu repositório no GitHub.
+O código fonte da LuaSQL pode ser baixado do seu repositório no GitHub.
 

 
-
Créditos

+
Créditos

+
+
LuaSQL 2.x

 
-
LuaSQL 2.0

 

-A Versão 2.0 foi redesenhada por Roberto Ierusalimschy, André Carregal
-e Tomás Guisasola como parte do
+A versão 2.7 introduz suporte a variáveis To-be-closed além de adaptar todos os drivers para a versão 5.4 de Lua. 
Esta versão foi implementada por Chaitanya Deshmukh durante o GSoC 2024 sob a orientação de Tomás Guisasola.
+

+
+

+A versão 2.5 incorpora suporte a busca no resultado no driver MySQL.
+

+

+A versão 2.3.5 incorpora algumas correções e pequenas melhorias (agradecimento a IR4T4 e tomatolog).
+Essa versão funciona com as versões 5.1, 5.2 and 5.3 de Lua.
+

+

+A versão 2.3 é apenas uma adaptação do código para funcionar com as versões 5.0, 5.1 e 5.2 de Lua.
+

+

+A partir da versão 2.2 começou o desenvolvimento distribuído com todas as discussões sobre o projeto acontecendo na lista de interesse do Projeto Kepler.
+Novos desenvolvedores: Hisham Muhammad, Ignacio Burgueño, Luis Eduardo Jason Santos, Marc Nijdam, Mauricio Bomfim and Scott Morgan.
+

+
LuaSQL 2.0 e 2.1

+

+A versão 2.0 foi redesenhada por Roberto Ierusalimschy, André Carregal
+e Tomás Guisasola como parte do
 Projeto Kepler.
-A implementação é compatível com Lua 5.0 e foi codificada por Tomás Guisasola, Eduardo Quintão, Thiago Ponte, Fabio Mascarenhas, Danilo Tuler, 
-com inestimáveis contribuições de Michael Roth, Tiago Dionizio e Leonardo Godinho.
+A implementação das versões 2.0 e 2.1 é compatível com Lua 5.0 e foi codificada
+por Tomás Guisasola, Eduardo Quintão, Thiago Ponte, Fabio Mascarenhas, Danilo Tuler,
+com inestimáveis contribuições de Michael Broughton, Pedro Maia, Klaus Ripke, Michael Roth, Tiago Dionizio e Leonardo Godinho.
 

 
 
LuaSQL 1.0

 

-LuaSQL foi projetado por Pedro Miller Rabinovitch e Roberto
-Ierusalimschy.
-A primeira implementação era compatível com Lua 4.0a.
-Muitas modificações foram feitas, mas não distribuídas, por Diego Nehab (ODBC),
-Carlos Cassino, Tomás Guisasola and Eduardo Quintão (PostgreSQL).
+LuaSQL foi projetado por Pedro Miller Rabinovitch e Roberto Ierusalimschy.
+A primeira implementação era compatível com Lua 4.0a.
+Muitas modificações foram feitas, mas não distribuídas, por Diego Nehab (ODBC),
+Carlos Cassino, Tomás Guisasola and Eduardo Quintão (PostgreSQL).
 

 

-O desenvolvimento de LuaSQL foi patrocinado pela 
-Fábrica Digital, FINEP e CNPq.
+O desenvolvimento da LuaSQL foi patrocinado pela
+Fábrica Digital, FINEP e CNPq.
 

 
 
Contato

 
 

-Para mais informações, entre em
+Para mais informações, entre em
 contato conosco.
-Comentários são muito bem-vindos!
+Comentários são muito bem-vindos!
 

 
 

-A lista de discussão
-do projeto Kepler é outra forma de entrar em contato com desenvolvedores
-e usuários da plataforma Kepler.
+A lista de discussão
+do projeto Kepler é outra forma de entrar em contato com desenvolvedores
+e usuários da plataforma Kepler.
diff -pruN 2.6.0-3/doc/br/license.html 2.7.0-1/doc/br/license.html --- 2.6.0-3/doc/br/license.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/br/license.html 2025-04-23 23:51:04.000000000 +0000 @@ -52,8 +52,8 @@
  • Histórico
  • Projeto
  • Licença
    • @@ -87,7 +87,7 @@ somewhere in your product or its documen The implementation is not derived from licensed software.

    -

    Copyright © 2003-2006 The Kepler Project.

    +

    Copyright © 2003-2025 The Kepler Project.

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -114,7 +114,6 @@ THE SOFTWARE.

    Valid XHTML 1.0!

    -$Id: license.html,v 1.6 2008/06/11 00:26:13 jasonsantos Exp $

    diff -pruN 2.6.0-3/doc/br/manual.html 2.7.0-1/doc/br/manual.html --- 2.6.0-3/doc/br/manual.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/br/manual.html 2025-04-23 23:51:04.000000000 +0000 @@ -52,8 +52,8 @@
  • Histórico
  • Projeto
  • Licença
    • @@ -85,16 +85,16 @@ A conexão pode executar comandos um arquivo fonte e um arquivo cabeçalho comuns a todos os drivers (luasql.h e luasql.c) – e um arquivo fonte para cada driver. Cada driver deve ser compilado juntamente com o arquivo luasql.c -para gerar uma biblioteca. Essa biblioteca pode ser linkada à aplicação +para gerar uma biblioteca. Essa biblioteca pode ser linkada à aplicação ou carregada dinamicamente. A função de inicialização é -luaopen_luasqlnomedriver e é compatível com o formato +luaopen_luasqlnomedriver e é compatível com o formato open-library de Lua.

    Instalação

    -

    Todos os drivers LuaSQL seguem a +

    Todos os drivers LuaSQL seguem a proposta de pacotes -para Lua 5.1. Logo, esse pacote deve ser "instalado". Consulte a seção de +para Lua 5.1. Logo, esse pacote deve ser "instalado". Consulte a seção de configuração do Compat-5.1 para saber como instalar os pacotes binários da maneira correta. @@ -188,12 +188,11 @@ env = luasql.jdbc ("com.mysql.jdbc.Drive

    env:close()
    Fecha o ambiente env. Só é bem sucedido se todas as suas conexões já tiverem sido fechadas anteriormente.
    - Retorna: true, em caso de sucesso; false, quando o ambiente - já estiver fechado. + Retorna: true em caso de sucesso e em caso de falha retorna false com uma mensagem de string indicando o motivo da falha.
    env:connect(sourcename[,username[,password]])
    -
    Conecta à fonte de dados especificada em sourcename usando +
    Conecta à fonte de dados especificada em sourcename usando username e password se eles são fornecidos.
    O sourcename pode variar de acordo com cada driver. Alguns usam simplesmente o nome do banco de dados, como PostgreSQL, MySQL e SQLite; @@ -210,7 +209,7 @@ env = luasql.jdbc ("com.mysql.jdbc.Drive

    Conexão

    -

    Uma conexão contém atributos e parâmetros específicos de uma +

    Uma conexão contém atributos e parâmetros específicos de uma única conexão de base de dados. Uma conexão é criada chamando o método environment:connect.

    @@ -220,7 +219,7 @@ o método conn:close()
    Fecha a conexão conn. Só é bem sucedido se todos os seus cursores tiverem sido fechados anteriormente e se a conexão ainda estiver aberta.
    - Retorna: true, em caso de sucesso; false em caso de fracasso. + Retorna: true em caso de sucesso e em caso de falha retorna false com uma mensagem de string indicando o motivo da falha.
    conn:commit()
    @@ -267,8 +266,7 @@ e Oracle
    cur:close()
    Fecha esse cursor.
    - Retorna: true, em caso de sucesso; false, quando o cursor - já está fechado. + Retorna: true em caso de sucesso e em caso de falha retorna false com uma mensagem de string indicando o motivo da falha.
    cur:fetch([table[,modestring]])
    @@ -278,7 +276,7 @@ e Oraclemodestring    ): uma seqüência - de caracteres indicando como deve ser construída a tabela de resultados. + de caracteres indicando como deve ser construída a tabela de resultados. A seqüência de caracteres do modo pode conter:
    "n"
    a tabela resultante terá índices numéricos (padrão)
    @@ -320,7 +318,7 @@ o driver Postgres oferece as seguintes f
    No driver PostgreSQL este método tem mais dois parâmetros opcionais que indicam o hostname e a port a serem utilizados na conexão. Além disso, o primeiro parâmetro também pode conter todas as informações - de conexão, como é dito na documentação + de conexão, como é dito na documentação para a função PQconnectdb no manual do PostgreSQL (ex. environment:connect("dbname=<name> user=<username>"))
    Veja também: ambiente
    @@ -404,4 +402,4 @@ o driver para SQLite3 ainda oferece uma
    - + diff -pruN 2.6.0-3/doc/fr/doc.css 2.7.0-1/doc/fr/doc.css --- 2.6.0-3/doc/fr/doc.css 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/fr/doc.css 2025-04-23 23:51:04.000000000 +0000 @@ -1,16 +1,16 @@ -body { - margin-left: 1em; - margin-right: 1em; +body { + margin-left: 1em; + margin-right: 1em; font-family: arial, helvetica, geneva, sans-serif; background-color:#ffffff; margin:0px; } code { - font-family: "Andale Mono", monospace; + font-family: "Andale Mono", monospace; } tt { - font-family: "Andale Mono", monospace; + font-family: "Andale Mono", monospace; } body, td, th { font-size: 11pt; } @@ -35,10 +35,10 @@ h3 { padding-top: 1em; } p { margin-left: 1em; } -p.name { - font-family: "Andale Mono", monospace; +p.name { + font-family: "Andale Mono", monospace; padding-top: 1em; - margin-left: 0em; + margin-left: 0em; } blockquote { margin-left: 3em; } @@ -60,13 +60,13 @@ blockquote { margin-left: 3em; } padding: 1em; margin-left: 1em; margin-right: 1em; - font-family: "Andale Mono", monospace; + font-family: "Andale Mono", monospace; font-size: smaller; } -hr { +hr { margin-left: 0em; - background: #00007f; + background: #00007f; border: 0px; height: 1px; } @@ -205,7 +205,7 @@ div.header, div.footer { margin-left: 0e display: none; } .example { - font-family: "Andale Mono", monospace; + font-family: "Andale Mono", monospace; font-size: 8pt; page-break-inside: avoid; } diff -pruN 2.6.0-3/doc/fr/examples.html 2.7.0-1/doc/fr/examples.html --- 2.6.0-3/doc/fr/examples.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/fr/examples.html 2025-04-23 23:51:04.000000000 +0000 @@ -52,8 +52,8 @@
  • History
  • Project
  • License
    • @@ -135,7 +135,7 @@ end

    Here is how the iterator is used:

    - + 
     env = assert (require"luasql.mysql".mysql())
 con = assert (env:connect"my_db")
@@ -146,6 +146,21 @@ end
 
 
    Obviously, the code above only works if there is a table called contacts with the columns id, name and address in this order. At the end of the loop the cursor will be automatically closed by the driver.
    
 
+
    To-be-closed Objects
    
+
+
    
+	Compatibility Note:
+	To-be-closed variables is a feature introduced in Lua 5.4. Therefore, this functionality can only be used if LuaSQL (version > 2.6) is compiled against Lua version 5.4 or higher.
+
    
+
+
    +function getName(db, id)
+  -- This code requires Lua 5.4 or higher due to the use of to-be-closed variables.
+  local cur <close> = db:execute("SELECT name FROM contacts WHERE id = " .. id)
+  return cur:fetch()
+end
+
    
+
    diff -pruN 2.6.0-3/doc/fr/history.html 2.7.0-1/doc/fr/history.html --- 2.6.0-3/doc/fr/history.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/fr/history.html 2025-04-23 23:51:04.000000000 +0000 @@ -52,8 +52,8 @@
  • History
  • Project
  • License
    • @@ -120,7 +120,7 @@
  • Corrected bug avoiding duplicate access to stack
    • - +
    LuaSQL 2.0.2 [26/Jun/2006]
    env:connect(sourcename[,username[,password]])
    -
    Connects to a data source specified in sourcename using +
    Connects to a data source specified in sourcename using username and password if they are supplied.
    The sourcename may vary according to each driver. Some use a simple database name, like PostgreSQL, MySQL and SQLite; @@ -215,7 +214,7 @@ method.

    conn:close()
    Closes the connection conn. Only successful if all cursors pertaining to it have been closed and the connection is still open.
    - Returns: true in case of success and false in case of failure.
    + Returns: true in case of success and in case of failure it returns false with a string message stating the failure reason.
    conn:commit()
    @@ -268,8 +267,7 @@ and Oracle<
    cur:close()
    Closes this cursor.
    - Returns: true in case of success and false when - the object is already closed.
    + Returns: true in case of success and in case of failure it returns false with a string message stating the failure reason.
    cur:fetch([table[,modestring]])
    @@ -430,4 +428,4 @@ the SQLite3 driver also offers this extr - + diff -pruN 2.6.0-3/doc/us/doc.css 2.7.0-1/doc/us/doc.css --- 2.6.0-3/doc/us/doc.css 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/doc.css 2025-04-23 23:51:04.000000000 +0000 @@ -1,4 +1,4 @@ -body { +body { color: #47555c; font-size: 16px; font-family: "Open Sans", sans-serif; @@ -24,18 +24,18 @@ hr { } code { - font-family: "Open Sans Mono", "Andale Mono", monospace; + font-family: "Open Sans Mono", "Andale Mono", monospace; } tt { - font-family: "Open Sans Mono", "Andale Mono", monospace; + font-family: "Open Sans Mono", "Andale Mono", monospace; } body, td, th { } textarea, pre, tt { - font-family: "Open Sans Mono", "Andale Mono", monospace; + font-family: "Open Sans Mono", "Andale Mono", monospace; } img { @@ -205,7 +205,7 @@ dl.reference dd { display: none; } .example { - font-family: "Andale Mono", monospace; + font-family: "Andale Mono", monospace; font-size: 8pt; page-break-inside: avoid; } diff -pruN 2.6.0-3/doc/us/examples.html 2.7.0-1/doc/us/examples.html --- 2.6.0-3/doc/us/examples.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/examples.html 2025-04-23 23:51:04.000000000 +0000 @@ -11,9 +11,9 @@
    -
    LuaSQL
    Database connectivity for the Lua programming language
    @@ -29,10 +29,10 @@
  • Examples
  • History
    • -
  • Project +
  • Project
  • License
    • @@ -114,7 +114,7 @@ end

    Here is how the iterator is used:

    - + 
     env = assert (require"luasql.mysql".mysql())
 con = assert (env:connect"my_db")
@@ -125,6 +125,21 @@ end
 
 
    Obviously, the code above only works if there is a table called contacts with the columns id, name and address in this order. At the end of the loop the cursor will be automatically closed by the driver.
    
 
+
    To-be-closed Objects
    
+
+
    
+	Compatibility Note:
+	To-be-closed variables is a feature introduced in Lua 5.4. Therefore, this functionality can only be used if LuaSQL (version > 2.6) is compiled against Lua version 5.4 or higher.
+
    
+
+
    +function getName(db, id)
+  -- This code requires Lua 5.4 or higher due to the use of to-be-closed variables.
+  local cur <close> = db:execute("SELECT name FROM contacts WHERE id = " .. id)
+  return cur:fetch()
+end
+
    
+
    diff -pruN 2.6.0-3/doc/us/history.html 2.7.0-1/doc/us/history.html --- 2.6.0-3/doc/us/history.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/history.html 2025-04-23 23:51:04.000000000 +0000 @@ -31,8 +31,8 @@
  • History
  • Project
  • License
    • @@ -44,6 +44,29 @@

    History

    +
    LuaSQL 2.7.0 [23/Apr/2025]
    +
    +
      +
    • LuaSQL is adapted to Lua version 5.4 and all the drivers are compatible with To-be-closed variables.
      • +
    • The :close() method now returns false and a string with appropriate message instead of raising an error when there are related open objects.
      • +
    +
    + +
    LuaSQL 2.6.1 [07/Feb/2024]
    +
    +
      +
    • Corrected compatibility to Lua versions below 5.3 to SQLite3 (thanks to Daniel McCarney)
      • +
    +
    + +
    LuaSQL 2.6.0 [09/Sep/2020]
    +
    +
      +
    • Added read-only mode to SQLite3 and two new methods to MySQL fetch
      • +
    • Added library opening functions to ease the initialization process in C applications
      • +
    +
    +
    LuaSQL 2.5.0 [14/Jun/2019]
      @@ -152,7 +175,7 @@
    • Corrected bug avoiding duplicate access to stack
    - +
    LuaSQL 2.0.2 [26/Jun/2006]
      @@ -227,4 +250,4 @@ - + diff -pruN 2.6.0-3/doc/us/index.html 2.7.0-1/doc/us/index.html --- 2.6.0-3/doc/us/index.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/index.html 2025-04-23 23:51:04.000000000 +0000 @@ -11,9 +11,9 @@
      -
      LuaSQL
      Database connectivity for the Lua programming language
      @@ -36,9 +36,9 @@
    • Examples
    • History
      • -
    • Project +
    • Project
    • License
      • @@ -67,32 +67,37 @@ as Lua 5.1.

      Status

      -LuaSQL version 2.5.0 (for Lua 5.X) is now available for download. +LuaSQL version 2.7.0 (for Lua 5.X) is now available for download. For more details on the features list please check the product history.

      Download

      -LuaSQL can be installed via LuaRocks, using the +LuaSQL can be installed via LuaRocks, using the driver for your database of choice: 

      -luarocks install luasql-sqlite3
-luarocks install luasql-postgres
+luarocks install luasql-firebird
 luarocks install luasql-mysql
-luarocks install luasql-sqlite
+luarocks install luasql-oci8
 luarocks install luasql-odbc
-luarocks install luasql-firebird
+luarocks install luasql-postgres
+luarocks install luasql-sqlite
+luarocks install luasql-sqlite3
      -Source code for LuaSQL can be downloaded from its GitHub repository. +Source code for LuaSQL can be downloaded from its GitHub repository.

      Credits

      LuaSQL 2.x

      + +

      +Version 2.7 introduces support for To-be-closed variables and all the Drivers are adapted to Lua version 5.4.
      This was developed by Chaitanya Deshmukh (GSoC 2024) under the mentorship of Tomás Guisasola. +

      +

      Version 2.5 incorporates support in MySQL driver for seeking in the result set.

      @@ -104,14 +109,14 @@ This version works with Lua versions 5.1 Version 2.3 is just an adaptation of the code to work with Lua 5.0, 5.1 and 5.2.

      -Version 2.2 started a distributed development, with all project discussions happenign through the Kepler's mailing list. -New developers: Hisham Muhammad, Ignacio Burgueño, Luis Eduardo Jason Santos, Marc Nijdam, Mauricio Bomfim and Scott Morgan. +Version 2.2 started a distributed development, with all project discussions happening through the Kepler's mailing list. +New developers: Hisham Muhammad, Ignacio Burgueño, Luis Eduardo Jason Santos, Marc Nijdam, Mauricio Bomfim and Scott Morgan.

      -Version 2.1 and 2.0 were redesigned by Roberto Ierusalimschy, André Carregal -and Tomás Guisasola as part of the +Version 2.1 and 2.0 were redesigned by Roberto Ierusalimschy, André Carregal +and Tomás Guisasola as part of the Kepler Project. The implementation was coded by -Tomás Guisasola, Eduardo Quintão, Thiago Ponte, Fabio Mascarenhas and +Tomás Guisasola, Eduardo Quintão, Thiago Ponte, Fabio Mascarenhas and Danilo Tuler, with many contributions from Michael Broughton, Tiago Dionizio, Leonardo Godinho, Pedro Maia, Klaus Ripke, Michael Roth and others.

      LuaSQL 1.0

      @@ -119,10 +124,10 @@ Danilo Tuler, with many contributions fr

      LuaSQL was originally designed by Pedro Miller Rabinovitch and Roberto Ierusalimschy. The first implementation was compatible with Lua 4.0a. Many modifications were made but not distributed by Diego Nehab (ODBC), -Carlos Cassino, Tomás Guisasola and Eduardo Quintão (PostgreSQL).

      +Carlos Cassino, Tomás Guisasola and Eduardo Quintão (PostgreSQL).

      -

      LuaSQL development was sponsored by -Fábrica Digital, FINEP and CNPq.

      +

      LuaSQL development was sponsored by +Fábrica Digital, FINEP and CNPq.

      Contact us

      @@ -143,4 +148,4 @@ Comments are welcome!

      - + diff -pruN 2.6.0-3/doc/us/license.html 2.7.0-1/doc/us/license.html --- 2.6.0-3/doc/us/license.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/license.html 2025-04-23 23:51:04.000000000 +0000 @@ -30,8 +30,8 @@
    • History
    • Project
    • License
      • @@ -65,7 +65,7 @@ somewhere in your product or its documen The implementation is not derived from licensed software.

      -

      Copyright © 2003-2019 The Kepler Project.

      +

      Copyright © 2003-2025 The Kepler Project.

      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -pruN 2.6.0-3/doc/us/manual.html 2.7.0-1/doc/us/manual.html --- 2.6.0-3/doc/us/manual.html 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/doc/us/manual.html 2025-04-23 23:51:04.000000000 +0000 @@ -45,8 +45,8 @@

    • History
    • Project
    • License
      • @@ -90,7 +90,7 @@ as Lua 5.1. a pair of common source and header files (luasql.h and luasql.c); and one source file for each driver. Each driver should be compiled with the luasql.c file to generate a library. -This library can be linked to the application or dynamically loaded. +This library can be linked to the application or dynamically loaded. The initialization function is luaopen_luasqldrivername and it is a Lua open-library compatible function.

      @@ -176,11 +176,10 @@ local env = driver.odbc()
      env:close()
      Closes the environment env. Only successful if all connections pertaining to it were closed first.
      - Returns: true in case of success; false when - the object is already closed.
      + Returns: true in case of success and in case of failure it returns false with a string message stating the failure reason.
    env:connect(sourcename[,username[,password]])
    -
    Connects to a data source specified in sourcename using +
    Connects to a data source specified in sourcename using username and password if they are supplied.
    The sourcename may vary according to each driver. Some use a simple database name, like PostgreSQL, MySQL and SQLite; @@ -208,7 +207,7 @@ method.

    conn:close()
    Closes the connection conn. Only successful if all cursors pertaining to it have been closed and the connection is still open.
    - Returns: true in case of success and false in case of failure.
    + Returns: true in case of success and in case of failure it returns false with a string message stating the failure reason.
    conn:commit()
    @@ -261,8 +260,7 @@ and Oracle<
    cur:close()
    Closes this cursor.
    - Returns: true in case of success and false when - the object is already closed.
    + Returns: true in case of success and in case of failure it returns false with a string message stating the failure reason.
    cur:fetch([table[,modestring]])
    @@ -388,7 +386,7 @@ the MySQL driver also offers these extra
    Retrieves the next result set, if another result is available (e.g. multiple statements)
    See also: cursor objects
    Returns: true, if next result was selected. false and -1 if no other result is available. false, errno and error message, if an error occured.
    - To use it you need to pass the CLIENT_MULTI_STATEMENTS = 1<<16 flag on connection. + To use it you need to pass the CLIENT_MULTI_STATEMENTS = 1<<16 flag on connection. Be aware that you need to iterate over all results otherwise you will receive an "out of sync" error.
    @@ -397,15 +395,13 @@ the MySQL driver also offers these extra
    Checks if next result is available
    See also: cursor objects
    Returns: true or false
    - To use it you need to pass the CLIENT_MULTI_STATEMENTS = 1<<16 flag on connection. + To use it you need to pass the CLIENT_MULTI_STATEMENTS = 1<<16 flag on connection. Be aware that you need to iterate over all results otherwise you will receive an "out of sync" error.

    Notes:

    -

    I

    -

    This driver is compatible with versions 4.0, 4.1 and 5.0 of the MySQL API. Only from version 4.1 MySQL provides support for transactions by using BDB or INNODB tables. @@ -433,7 +429,8 @@ the Oracle driver also offers this extra

    Besides the basic functionality provided by all drivers, the SQLite3 driver also offers this extra feature:

    -
    env:connect(sourcename[,locktimeout,readOnlyMode])
    +
    +
    env:connect(sourcename[,locktimeout,readOnlyMode])
    In the SQLite3 driver, this method adds an optional parameter that indicate the amount of milliseconds to wait for a write lock if one cannot be obtained immediately. To connect in readOnlyMode, set readOnlyMode to true.
    @@ -446,7 +443,7 @@ the SQLite3 driver also offers this extr See also: Official documentation of function sqlite3_mprintf
    Returns: the escaped string.
    - +
    @@ -458,4 +455,4 @@ the SQLite3 driver also offers this extr - + diff -pruN 2.6.0-3/rockspec/luasql-firebird-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-firebird-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-firebird-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-firebird-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-Firebird" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Firebird driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://keplerproject.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + FB = { + header = "ibase.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.firebird"] = { + sources = { "src/luasql.c", "src/ls_firebird.c" }, + libraries = { "fbclient" }, + incdirs = { "$(FB_INCDIR)" }, + libdirs = { "$(FB_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-firebird-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-firebird-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-firebird-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-firebird-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-Firebird" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Firebird driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + FB = { + header = "ibase.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.firebird"] = { + sources = { "src/luasql.c", "src/ls_firebird.c" }, + libraries = { "fbclient" }, + incdirs = { "$(FB_INCDIR)" }, + libdirs = { "$(FB_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-mysql-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-mysql-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-mysql-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-mysql-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-MySQL" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (MySQL driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://www.keplerproject.org/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + MYSQL = { + header = "mysql.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.mysql"] = { + sources = { "src/luasql.c", "src/ls_mysql.c" }, + libraries = { "mysqlclient" }, + incdirs = { "$(MYSQL_INCDIR)" }, + libdirs = { "$(MYSQL_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-mysql-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-mysql-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-mysql-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-mysql-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-MySQL" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (MySQL driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + MYSQL = { + header = "mysql.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.mysql"] = { + sources = { "src/luasql.c", "src/ls_mysql.c" }, + libraries = { "mysqlclient" }, + incdirs = { "$(MYSQL_INCDIR)" }, + libdirs = { "$(MYSQL_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-oci8-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-oci8-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-oci8-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-oci8-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-OCI8" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Oracle driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://www.keplerproject.org/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + OCI8 = { + header = "oci.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.oci8"] = { + sources = { "src/luasql.c", "src/ls_oci8.c" }, + libraries = { "z", "clntsh", }, + incdirs = { "$(OCI8_INCDIR)" }, + libdirs = { "$(OCI8_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-oci8-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-oci8-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-oci8-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-oci8-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-OCI8" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Oracle driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + OCI8 = { + header = "oci.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.oci8"] = { + sources = { "src/luasql.c", "src/ls_oci8.c" }, + libraries = { "z", "clntsh", }, + incdirs = { "$(OCI8_INCDIR)" }, + libdirs = { "$(OCI8_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-odbc-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-odbc-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-odbc-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-odbc-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-ODBC" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (ODBC driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://www.keplerproject.org/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + ODBC = { + header = "sql.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.odbc"] = { + sources = { "src/luasql.c", "src/ls_odbc.c" }, + libraries = { "odbc" }, + incdirs = { "$(ODBC_INCDIR)" }, + libdirs = { "$(ODBC_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-odbc-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-odbc-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-odbc-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-odbc-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,49 @@ +package = "LuaSQL-ODBC" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (ODBC driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + ODBC = { + header = "sql.h" + } +} +build = { + type = "builtin", + platforms = { + windows = { + modules = { + ["luasql.odbc"] = { + sources = { "src/luasql.c", "src/ls_odbc.c" }, + incdirs = { "$(ODBC_INCDIR)" }, + libdirs = { "$(ODBC_LIBDIR)" }, + libraries = { "odbc32" } + } + } + }, + unix = { + modules = { + ["luasql.odbc"] = { + sources = { "src/luasql.c", "src/ls_odbc.c" }, + incdirs = { "$(ODBC_INCDIR)" }, + libdirs = { "$(ODBC_LIBDIR)" }, + libraries = { "odbc" } + } + } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-postgres-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-postgres-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-postgres-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-postgres-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-Postgres" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Postgres driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://keplerproject.github.io/luasql/" +} +dependencies = { + "lua >= 5.0" +} +external_dependencies = { + PGSQL = { + header = "libpq-fe.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.postgres"] = { + sources = { "src/luasql.c", "src/ls_postgres.c" }, + libraries = { "pq" }, + incdirs = { "$(PGSQL_INCDIR)" }, + libdirs = { "$(PGSQL_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-postgres-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-postgres-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-postgres-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-postgres-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-Postgres" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (Postgres driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.0" +} +external_dependencies = { + PGSQL = { + header = "libpq-fe.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.postgres"] = { + sources = { "src/luasql.c", "src/ls_postgres.c" }, + libraries = { "pq" }, + incdirs = { "$(PGSQL_INCDIR)" }, + libdirs = { "$(PGSQL_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-sqlite-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-sqlite-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-sqlite-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-sqlite-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-SQLite" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (SQLite driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://www.keplerproject.org/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + SQLITE = { + header = "sqlite.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.sqlite"] = { + sources = { "src/luasql.c", "src/ls_sqlite.c" }, + libraries = { "sqlite" }, + incdirs = { "$(SQLITE_INCDIR)" }, + libdirs = { "$(SQLITE_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-sqlite-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-sqlite-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-sqlite-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-sqlite-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-SQLite" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (SQLite driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + SQLITE = { + header = "sqlite.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.sqlite"] = { + sources = { "src/luasql.c", "src/ls_sqlite.c" }, + libraries = { "sqlite" }, + incdirs = { "$(SQLITE_INCDIR)" }, + libdirs = { "$(SQLITE_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-sqlite3-2.6.0-2.rockspec 2.7.0-1/rockspec/luasql-sqlite3-2.6.0-2.rockspec --- 2.6.0-3/rockspec/luasql-sqlite3-2.6.0-2.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-sqlite3-2.6.0-2.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-SQLite3" +version = "2.6.0-2" +source = { + url = "git+https://github.com/keplerproject/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (SQLite3 driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "http://www.keplerproject.org/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + SQLITE = { + header = "sqlite3.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.sqlite3"] = { + sources = { "src/luasql.c", "src/ls_sqlite3.c" }, + libraries = { "sqlite3" }, + incdirs = { "$(SQLITE_INCDIR)" }, + libdirs = { "$(SQLITE_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-sqlite3-2.6.0-3.rockspec 2.7.0-1/rockspec/luasql-sqlite3-2.6.0-3.rockspec --- 2.6.0-3/rockspec/luasql-sqlite3-2.6.0-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-sqlite3-2.6.0-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-SQLite3" +version = "2.6.0-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (SQLite3 driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + SQLITE = { + header = "sqlite3.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.sqlite3"] = { + sources = { "src/luasql.c", "src/ls_sqlite3.c" }, + libraries = { "sqlite3" }, + incdirs = { "$(SQLITE_INCDIR)" }, + libdirs = { "$(SQLITE_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/rockspec/luasql-sqlite3-2.6.1-3.rockspec 2.7.0-1/rockspec/luasql-sqlite3-2.6.1-3.rockspec --- 2.6.0-3/rockspec/luasql-sqlite3-2.6.1-3.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/rockspec/luasql-sqlite3-2.6.1-3.rockspec 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,35 @@ +package = "LuaSQL-SQLite3" +version = "2.6.1-3" +source = { + url = "git+https://github.com/lunarmodules/luasql.git", + branch = "2.6.0", +} +description = { + summary = "Database connectivity for Lua (SQLite3 driver)", + detailed = [[ + LuaSQL is a simple interface from Lua to a DBMS. It enables a + Lua program to connect to databases, execute arbitrary SQL statements + and retrieve results in a row-by-row cursor fashion. + ]], + license = "MIT/X11", + homepage = "https://lunarmodules.github.io/luasql/" +} +dependencies = { + "lua >= 5.1" +} +external_dependencies = { + SQLITE = { + header = "sqlite3.h" + } +} +build = { + type = "builtin", + modules = { + ["luasql.sqlite3"] = { + sources = { "src/luasql.c", "src/ls_sqlite3.c" }, + libraries = { "sqlite3" }, + incdirs = { "$(SQLITE_INCDIR)" }, + libdirs = { "$(SQLITE_LIBDIR)" } + } + } +} diff -pruN 2.6.0-3/src/ls_firebird.c 2.7.0-1/src/ls_firebird.c --- 2.6.0-3/src/ls_firebird.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_firebird.c 2025-04-23 23:51:04.000000000 +0000 @@ -1,1101 +1,1119 @@ -/* -** LuaSQL, Firebird driver -** Authors: Scott Morgan -** ls_firebird.c -*/ - -#include /* The Firebird API*/ -#include /* For managing time values */ -#include -#include - -/* Lua API */ -#include -#include - -#include "luasql.h" - -#define LUASQL_ENVIRONMENT_FIREBIRD "Firebird environment" -#define LUASQL_CONNECTION_FIREBIRD "Firebird connection" -#define LUASQL_CURSOR_FIREBIRD "Firebird cursor" - -typedef struct { - short closed; - ISC_STATUS status_vector[20]; /* for error results */ - int lock; /* lock count for open connections */ -} env_data; - -typedef struct { - short closed; - env_data* env; /* the DB enviroment this is in */ - isc_db_handle db; /* the database handle */ - char dpb_buffer[256];/* holds the database paramet buffer */ - short dpb_length; /* the used amount of the dpb */ - isc_tr_handle transaction; /* the transaction handle */ - int lock; /* lock count for open cursors */ - int autocommit; /* should each statement be commited */ -} conn_data; - -typedef struct { - short closed; - env_data* env; /* the DB enviroment this is in */ - conn_data* conn; /* the DB connection this cursor is from */ - isc_stmt_handle stmt; /* the statement handle */ - int stmt_type; /* the type of the statment */ - XSQLDA *out_sqlda; /* the cursor data array */ -} cur_data; - -/* How many fields to pre-alloc to the cursor */ -#define CURSOR_PREALLOC 10 - -/* Macro to ease code reading */ -#define CHECK_DB_ERROR( X ) ( (X)[0] == 1 && (X)[1] ) - -/* Use the new interpret API if available */ -#undef FB_INTERPRET -#if FB_API_VER >= 20 - #define FB_INTERPRET(BUF, LEN, VECTOR) fb_interpret(BUF, LEN, VECTOR) -#else - #define FB_INTERPRET(BUF, LEN, VECTOR) isc_interpret(BUF, VECTOR) -#endif - -#if LUA_VERSION_NUM>=503 -#define luasql_pushinteger lua_pushinteger -#else -#define luasql_pushinteger lua_pushnumber -#endif - -/* -** Returns a standard database error message -*/ -static int return_db_error(lua_State *L, const ISC_STATUS *pvector) -{ - char errmsg[512]; - - lua_pushnil(L); - FB_INTERPRET(errmsg, 512, &pvector); - lua_pushstring(L, errmsg); - while(FB_INTERPRET(errmsg, 512, &pvector)) { - lua_pushstring(L, "\n * "); - lua_pushstring(L, errmsg); - lua_concat(L, 3); - } - - return 2; -} - -/* -** Registers a given C object in the registry to avoid GC -*/ -static void lua_registerobj(lua_State *L, int index, void *obj) -{ - lua_pushvalue(L, index); - lua_pushlightuserdata(L, obj); - lua_pushvalue(L, -2); - lua_settable(L, LUA_REGISTRYINDEX); - lua_pop(L, 1); -} - -/* -** Unregisters a given C object from the registry -*/ -static void lua_unregisterobj(lua_State *L, void *obj) -{ - lua_pushlightuserdata(L, obj); - lua_pushnil(L); - lua_settable(L, LUA_REGISTRYINDEX); -} - -/* -** Free's up the memory alloc'd to the cursor data -*/ -static void free_cur(cur_data* cur) -{ - int i; - XSQLVAR *var; - - /* free the field memory blocks */ - for (i=0, var = cur->out_sqlda->sqlvar; i < cur->out_sqlda->sqld; i++, var++) { - free(var->sqldata); - if(var->sqlind != NULL) - free(var->sqlind); - } - - /* free the data array */ - free(cur->out_sqlda); -} - -/* -** Shuts down a cursor -*/ -static int cur_shut(lua_State *L, cur_data *cur) -{ - isc_dsql_free_statement(cur->env->status_vector, &cur->stmt, - DSQL_close); - if ( CHECK_DB_ERROR(cur->env->status_vector) ) { - return return_db_error(L, cur->env->status_vector); - } - - /* free the cursor data */ - free_cur(cur); - - /* remove cursor from lock count and check if statment can be unregistered */ - cur->closed = 1; - --cur->conn->lock; - - /* check if connection can be unregistered */ - if(cur->conn->lock == 0) - lua_unregisterobj(L, cur->conn); - - return 0; -} - -/* -** Check for valid environment. -*/ -static env_data *getenvironment (lua_State *L, int i) { - env_data *env = (env_data *)luaL_checkudata (L, i, LUASQL_ENVIRONMENT_FIREBIRD); - luaL_argcheck (L, env != NULL, i, "environment expected"); - luaL_argcheck (L, !env->closed, i, "environment is closed"); - return env; -} - -/* -** Check for valid connection. -*/ -static conn_data *getconnection (lua_State *L, int i) { - conn_data *conn = (conn_data *)luaL_checkudata (L, i, LUASQL_CONNECTION_FIREBIRD); - luaL_argcheck (L, conn != NULL, i, "connection expected"); - luaL_argcheck (L, !conn->closed, i, "connection is closed"); - return conn; -} - -/* -** Check for valid cursor. -*/ -static cur_data *getcursor (lua_State *L, int i) { - cur_data *cur = (cur_data *)luaL_checkudata (L, i, LUASQL_CURSOR_FIREBIRD); - luaL_argcheck (L, cur != NULL, i, "cursor expected"); - luaL_argcheck (L, !cur->closed, i, "cursor is closed"); - return cur; -} - -/* -** Returns the statement type -*/ -static int get_statement_type(cur_data* cur) -{ - int length, type; - char type_item[] = { isc_info_sql_stmt_type }; - char res_buffer[88], *pres; - - pres = res_buffer; - - isc_dsql_sql_info( cur->env->status_vector, &cur->stmt, - sizeof(type_item), type_item, - sizeof(res_buffer), res_buffer ); - if (cur->env->status_vector[0] == 1 && cur->env->status_vector[1] > 0) - return -1; - - /* check the type of the statement */ - if (*pres == isc_info_sql_stmt_type) - { - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - type = isc_vax_integer(pres, length); - pres += length; - } else - return -2; /* should have had the isc_info_sql_stmt_type info */ - - return type; -} - -/* -** Return the number of rows affected by last operation -*/ -static int count_rows_affected(cur_data* cur) -{ - int length, type, res=0; - int del_count = 0, ins_count = 0, upd_count = 0, sel_count = 0; - char type_item[] = { isc_info_sql_stmt_type, isc_info_sql_records }; - char res_buffer[88], *pres; - - pres = res_buffer; - - isc_dsql_sql_info( cur->env->status_vector, &cur->stmt, - sizeof(type_item), type_item, - sizeof(res_buffer), res_buffer ); - if (cur->env->status_vector[0] == 1 && cur->env->status_vector[1] > 0) - return -1; - - /* check the type of the statement */ - if (*pres == isc_info_sql_stmt_type) - { - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - type = isc_vax_integer(pres, length); - pres += length; - } else - return -2; /* should have had the isc_info_sql_stmt_type info */ - - if(type > 4) - return 0; /* not a SELECT, INSERT, UPDATE or DELETE SQL statement */ - - if (*pres == isc_info_sql_records) - { - pres++; - length = isc_vax_integer(pres, 2); /* normally 29 bytes */ - pres += 2; - - while(*pres != 1) { - switch(*pres) { - case isc_info_req_select_count: - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - sel_count = isc_vax_integer(pres, length); - pres += length; - break; - case isc_info_req_insert_count: - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - ins_count = isc_vax_integer(pres, length); - pres += length; - break; - case isc_info_req_update_count: - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - upd_count = isc_vax_integer(pres, length); - pres += length; - break; - case isc_info_req_delete_count: - pres++; - length = isc_vax_integer(pres, 2); - pres += 2; - del_count = isc_vax_integer(pres, length); - pres += length; - break; - default: - pres++; - break; - } - } - } else - return -3; - - switch(type) { - case isc_info_sql_stmt_select: - res = sel_count; - break; - case isc_info_sql_stmt_delete: - res = del_count; - break; - case isc_info_sql_stmt_update: - res = upd_count; - break; - case isc_info_sql_stmt_insert: - res = ins_count; - break; - } - return res; -} - -static void *malloc_zero(size_t len) -{ - void *res = malloc(len); - memset(res, 0, len); - return res; -} - -/* -** Executes a SQL statement. -** Returns -** cursor object: if there are results or -** row count: number of rows affected by statement if no results -*/ -static int conn_execute (lua_State *L) { - conn_data *conn = getconnection(L,1); - const char *statement = luaL_checkstring(L, 2); - int dialect = (int)luaL_optnumber(L, 3, 3); - - XSQLVAR *var; - long dtype; - int i, n, count; - - cur_data cur; - - cur.closed = 0; - cur.env = conn->env; - cur.conn = conn; - cur.stmt = 0; - - cur.out_sqlda = (XSQLDA *)malloc(XSQLDA_LENGTH(CURSOR_PREALLOC)); - cur.out_sqlda->version = SQLDA_VERSION1; - cur.out_sqlda->sqln = CURSOR_PREALLOC; - - /* create a statement to handle the query */ - isc_dsql_allocate_statement(conn->env->status_vector, &conn->db, &cur.stmt); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - free(cur.out_sqlda); - return return_db_error(L, conn->env->status_vector); - } - - /* process the SQL ready to run the query */ - isc_dsql_prepare(conn->env->status_vector, &conn->transaction, &cur.stmt, 0, (char*)statement, dialect, cur.out_sqlda); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - free(cur.out_sqlda); - return return_db_error(L, conn->env->status_vector); - } - - /* what type of SQL statement is it? */ - cur.stmt_type = get_statement_type(&cur); - if(cur.stmt_type < 0) { - free(cur.out_sqlda); - return return_db_error(L, conn->env->status_vector); - } - - /* an unsupported SQL statement (something like COMMIT) */ - switch(cur.stmt_type) { - case isc_info_sql_stmt_select: - case isc_info_sql_stmt_insert: - case isc_info_sql_stmt_update: - case isc_info_sql_stmt_delete: - case isc_info_sql_stmt_ddl: - case isc_info_sql_stmt_exec_procedure: - break; - default: - free(cur.out_sqlda); - return luasql_faildirect(L, "unsupported SQL statement"); - } - - /* resize the result set if needed */ - if (cur.out_sqlda->sqld > cur.out_sqlda->sqln) - { - n = cur.out_sqlda->sqld; - free(cur.out_sqlda); - cur.out_sqlda = (XSQLDA *)malloc(XSQLDA_LENGTH(n)); - cur.out_sqlda->sqln = n; - cur.out_sqlda->version = SQLDA_VERSION1; - isc_dsql_describe(conn->env->status_vector, &cur.stmt, 1, cur.out_sqlda); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - free(cur.out_sqlda); - return return_db_error(L, conn->env->status_vector); - } - } - - /* prep the result set ready to handle the data */ - for (i=0, var = cur.out_sqlda->sqlvar; i < cur.out_sqlda->sqld; i++, var++) { - dtype = (var->sqltype & ~1); /* drop flag bit for now */ - switch(dtype) { - case SQL_VARYING: - var->sqldata = (char *)malloc_zero(sizeof(char)*var->sqllen + 2); - break; - case SQL_TEXT: - var->sqldata = (char *)malloc_zero(sizeof(char)*var->sqllen); - break; - case SQL_SHORT: - var->sqldata = (char *)malloc_zero(sizeof(ISC_SHORT)); - break; - case SQL_LONG: - var->sqldata = (char *)malloc_zero(sizeof(ISC_LONG)); - break; - case SQL_INT64: - var->sqldata = (char *)malloc_zero(sizeof(ISC_INT64)); - break; - case SQL_FLOAT: - var->sqldata = (char *)malloc_zero(sizeof(float)); - break; - case SQL_DOUBLE: - var->sqldata = (char *)malloc_zero(sizeof(double)); - break; - case SQL_TYPE_TIME: - var->sqldata = (char *)malloc_zero(sizeof(ISC_TIME)); - break; - case SQL_TYPE_DATE: - var->sqldata = (char *)malloc_zero(sizeof(ISC_DATE)); - break; - case SQL_TIMESTAMP: - var->sqldata = (char *)malloc_zero(sizeof(ISC_TIMESTAMP)); - break; - case SQL_BLOB: - var->sqldata = (char *)malloc_zero(sizeof(ISC_QUAD)); - break; - /* TODO : add extra data type handles here */ - } - - if (var->sqltype & 1) { - /* allocate variable to hold NULL status */ - var->sqlind = (short *)malloc(sizeof(short)); - } else { - var->sqlind = NULL; - } - } - - /* run the query */ - isc_dsql_execute(conn->env->status_vector, &conn->transaction, &cur.stmt, 1, NULL); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - free_cur(&cur); - return return_db_error(L, conn->env->status_vector); - } - - /* if autocommit is set and it's a non SELECT query, commit change */ - if(conn->autocommit != 0 && cur.stmt_type > 1) { - isc_commit_retaining(conn->env->status_vector, &conn->transaction); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - free_cur(&cur); - return return_db_error(L, conn->env->status_vector); - } - } - - /* what do we return? a cursor or a count */ - if(cur.out_sqlda->sqld > 0) { /* a cursor */ - char cur_name[32]; - cur_data* user_cur = (cur_data*)lua_newuserdata(L, sizeof(cur_data)); - luasql_setmeta (L, LUASQL_CURSOR_FIREBIRD); - - sprintf(cur_name, "dyn_cursor_%p", (void *)user_cur); - - /* open the cursor ready for fetch cycles */ - isc_dsql_set_cursor_name(cur.env->status_vector, &cur.stmt, cur_name, 0); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) { - lua_pop(L, 1); /* the userdata */ - free_cur(&cur); - return return_db_error(L, conn->env->status_vector); - } - - /* copy the cursor into a new lua userdata object */ - memcpy((void*)user_cur, (void*)&cur, sizeof(cur_data)); - - /* add cursor to the lock count */ - lua_registerobj(L, 1, conn); - ++conn->lock; - } else { /* a count */ - if( (count = count_rows_affected(&cur)) < 0 ) { - free(cur.out_sqlda); - return return_db_error(L, conn->env->status_vector); - } - - lua_pushnumber(L, count); - - /* totaly finnished with the cursor */ - isc_dsql_free_statement(conn->env->status_vector, &cur.stmt, DSQL_drop); - free(cur.out_sqlda); - } - - return 1; -} - -/* -** Commits the current transaction -*/ -static int conn_commit(lua_State *L) { - conn_data *conn = getconnection(L,1); - - isc_commit_retaining(conn->env->status_vector, &conn->transaction); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) - return return_db_error(L, conn->env->status_vector); - - lua_pushboolean(L, 1); - return 1; -} - -/* -** Rolls back the current transaction -** Lua Returns: -** 1 if rollback is sucsessful -** nil and error message otherwise. -*/ -static int conn_rollback(lua_State *L) { - conn_data *conn = getconnection(L,1); - - isc_rollback_retaining(conn->env->status_vector, &conn->transaction); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) - return return_db_error(L, conn->env->status_vector); - - lua_pushboolean(L, 1); - return 1; -} - -/* -** Sets the autocommit state of the connection -** Lua Returns: -** autocommit state (0:off, 1:on) -** nil and error message on error. -*/ -static int conn_setautocommit(lua_State *L) { - conn_data *conn = getconnection(L,1); - - if(lua_toboolean(L, 2)) - conn->autocommit = 1; - else - conn->autocommit = 0; - - lua_pushboolean(L, 1); - return 1; -} - -/* -** Closes a connection. -** Lua Returns: -** 1 if close was sucsessful, 0 if already closed -** nil and error message otherwise. -*/ -static int conn_close (lua_State *L) { - conn_data *conn = (conn_data *)luaL_checkudata(L,1,LUASQL_CONNECTION_FIREBIRD); - luaL_argcheck (L, conn != NULL, 1, "connection expected"); - - /* already closed */ - if(conn->closed != 0) { - lua_pushboolean(L, 0); - return 1; - } - - /* are all related cursors closed? */ - if(conn->lock > 0) - return luasql_faildirect(L, "there are still open cursors"); - - if(conn->autocommit != 0) - isc_commit_transaction(conn->env->status_vector, &conn->transaction); - else - isc_rollback_transaction(conn->env->status_vector, &conn->transaction); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) - return return_db_error(L, conn->env->status_vector); - - isc_detach_database(conn->env->status_vector, &conn->db); - if ( CHECK_DB_ERROR(conn->env->status_vector) ) - return return_db_error(L, conn->env->status_vector); - - conn->closed = 1; - --conn->env->lock; - - /* check environment can be GC'd */ - if(conn->env->lock == 0) - lua_unregisterobj(L, conn->env); - - lua_pushboolean(L, 1); - return 1; -} - -/* -** GCs an connection object -*/ -static int conn_gc (lua_State *L) { - conn_data *conn = (conn_data *)luaL_checkudata(L,1,LUASQL_CONNECTION_FIREBIRD); - - if(conn->closed == 0) { - if(conn->autocommit != 0) - isc_commit_transaction(conn->env->status_vector, &conn->transaction); - else - isc_rollback_transaction(conn->env->status_vector, &conn->transaction); - - isc_detach_database(conn->env->status_vector, &conn->db); - - conn->closed = 1; - --conn->env->lock; - - /* check environment can be GC'd */ - if(conn->env->lock == 0) - lua_unregisterobj(L, conn->env); - } - - return 0; -} - -/* -** Escapes a given string so that it can't break out of it's delimiting quotes -*/ -static int conn_escape(lua_State *L) { - size_t len; - const char *from = luaL_checklstring (L, 2, &len); - char *res = malloc(len*sizeof(char)*2+1); - char *to = res; - - if(res) { - while(*from != '\0') { - *(to++) = *from; - if(*from == '\'') - *(to++) = *from; - - from++; - } - *to = '\0'; - - lua_pushstring(L, res); - free(res); - return 1; - } - - luaL_error(L, "could not allocate escaped string"); - return 0; -} - -/* -** Pushes the indexed value onto the lua stack -*/ -static void push_column(lua_State *L, int i, cur_data *cur) { - int varcharlen; - struct tm timevar; - char timestr[256]; - ISC_STATUS blob_stat; - isc_blob_handle blob_handle = 0; - ISC_QUAD blob_id; - luaL_Buffer b; - char *buffer; - unsigned short actual_seg_len; - - if( (cur->out_sqlda->sqlvar[i].sqlind != NULL) && - (*(cur->out_sqlda->sqlvar[i].sqlind) != 0) ) { - /* a null field? */ - lua_pushnil(L); - } else { - switch(cur->out_sqlda->sqlvar[i].sqltype & ~1) { - case SQL_VARYING: - varcharlen = (int)isc_vax_integer(cur->out_sqlda->sqlvar[i].sqldata, 2); - lua_pushlstring(L, cur->out_sqlda->sqlvar[i].sqldata+2, varcharlen); - break; - case SQL_TEXT: - lua_pushlstring(L, cur->out_sqlda->sqlvar[i].sqldata, cur->out_sqlda->sqlvar[i].sqllen); - break; - case SQL_SHORT: - luasql_pushinteger(L, *(ISC_SHORT*)(cur->out_sqlda->sqlvar[i].sqldata)); - break; - case SQL_LONG: - luasql_pushinteger(L, *(ISC_LONG*)(cur->out_sqlda->sqlvar[i].sqldata)); - break; - case SQL_INT64: - luasql_pushinteger(L, *(ISC_INT64*)(cur->out_sqlda->sqlvar[i].sqldata)); - break; - case SQL_FLOAT: - lua_pushnumber(L, *(float*)(cur->out_sqlda->sqlvar[i].sqldata)); - break; - case SQL_DOUBLE: - lua_pushnumber(L, *(double*)(cur->out_sqlda->sqlvar[i].sqldata)); - break; - case SQL_TYPE_TIME: - isc_decode_sql_time((ISC_TIME*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); - strftime(timestr, 255, "%X", &timevar); - lua_pushstring(L, timestr); - break; - case SQL_TYPE_DATE: - isc_decode_sql_date((ISC_DATE*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); - strftime(timestr, 255, "%x", &timevar); - lua_pushstring(L, timestr); - break; - case SQL_TIMESTAMP: - isc_decode_timestamp((ISC_TIMESTAMP*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); - strftime(timestr, 255, "%x %X", &timevar); - lua_pushstring(L, timestr); - break; - case SQL_BLOB: - /* get the BLOB ID and open it */ - memcpy(&blob_id, cur->out_sqlda->sqlvar[i].sqldata, sizeof(ISC_QUAD)); - isc_open_blob2( cur->env->status_vector, - &cur->conn->db, &cur->conn->transaction, - &blob_handle, &blob_id, 0, NULL ); - /* fetch the blob data */ - luaL_buffinit(L, &b); - buffer = luaL_prepbuffer(&b); - - blob_stat = isc_get_segment( cur->env->status_vector, - &blob_handle, &actual_seg_len, - LUAL_BUFFERSIZE, buffer ); - while(blob_stat == 0 || cur->env->status_vector[1] == isc_segment) { - luaL_addsize(&b, actual_seg_len); - buffer = luaL_prepbuffer(&b); - blob_stat = isc_get_segment( cur->env->status_vector, - &blob_handle, &actual_seg_len, - LUAL_BUFFERSIZE, buffer ); - } - - /* finnished, close the BLOB */ - isc_close_blob(cur->env->status_vector, &blob_handle); - blob_handle = 0; - - luaL_pushresult(&b); - break; - default: - lua_pushstring(L, ""); - break; - } - } -} - -/* -** Returns a row of data from the query -** Lua Returns: -** list of results or table of results depending on call -** nil and error message otherwise. -*/ -static int cur_fetch (lua_State *L) { - ISC_STATUS fetch_stat; - int i, res; - cur_data *cur = (cur_data *)luaL_checkudata (L, 1, LUASQL_CURSOR_FIREBIRD); - const char *opts = luaL_optstring (L, 3, "n"); - int num = strchr(opts, 'n') != NULL; - int alpha = strchr(opts, 'a') != NULL; - - /* check cursor status */ - luaL_argcheck (L, cur != NULL, 1, "cursor expected"); - if (cur->closed) { - return 0; - } - - if ((fetch_stat = isc_dsql_fetch(cur->env->status_vector, &cur->stmt, 1, cur->out_sqlda)) == 0) { - if (lua_istable (L, 2)) { - /* remove the option string */ - lua_settop(L, 2); - - /* loop through the columns */ - for (i = 0; i < cur->out_sqlda->sqld; i++) { - push_column(L, i, cur); - - if (num) { - lua_pushnumber(L, i+1); - lua_pushvalue(L, -2); - lua_settable(L, 2); - } - - if (alpha) { - lua_pushlstring(L, cur->out_sqlda->sqlvar[i].aliasname, cur->out_sqlda->sqlvar[i].aliasname_length); - lua_pushvalue(L, -2); - lua_settable(L, 2); - } - - lua_pop(L, 1); - } - - /* returning given table */ - res = 1; - } else { - for (i = 0; i < cur->out_sqlda->sqld; i++) - push_column(L, i, cur); - - /* returning a list of values */ - res = cur->out_sqlda->sqld; - } - - /* close cursor for procedures/returnings as they (currently) only - return one result, and error on subsequent fetches */ - if (cur->stmt_type == isc_info_sql_stmt_exec_procedure) { - cur_shut(L, cur); - } - - return res; - } - - /* isc_dsql_fetch returns 100 if no more rows remain to be retrieved - so this can be ignored */ - if (fetch_stat != 100L) - return return_db_error(L, cur->env->status_vector); - - /* last row has been fetched, close cursor */ - isc_dsql_free_statement(cur->env->status_vector, &cur->stmt, DSQL_drop); - if ( CHECK_DB_ERROR(cur->env->status_vector) ) - return return_db_error(L, cur->env->status_vector); - - /* free the cursor data */ - free_cur(cur); - - cur->closed = 1; - - /* remove cursor from lock count */ - --cur->conn->lock; - - /* return sucsess */ - return 0; -} - -/* -** Returns a table of column names from the query -** Lua Returns: -** a table of column names -** nil and error message otherwise. -*/ -static int cur_colnames (lua_State *L) { - int i; - XSQLVAR *var; - cur_data *cur = getcursor(L,1); - - lua_newtable(L); - - for (i=1, var = cur->out_sqlda->sqlvar; i <= cur->out_sqlda->sqld; i++, var++) { - lua_pushnumber(L, i); - lua_pushlstring(L, var->aliasname, var->aliasname_length); - lua_settable(L, -3); - } - - return 1; -} - -/* -** Returns a table of column types from the query -** Lua Returns: -** a table of column types -** nil and error message otherwise. -*/ -static int cur_coltypes (lua_State *L) { - int i; - XSQLVAR *var; - cur_data *cur = getcursor(L,1); - - lua_newtable(L); - - for (i=1, var = cur->out_sqlda->sqlvar; i <= cur->out_sqlda->sqld; i++, var++) { - lua_pushnumber(L, i); - switch(var->sqltype & ~1) { - case SQL_VARYING: - case SQL_TEXT: - case SQL_TYPE_TIME: - case SQL_TYPE_DATE: - case SQL_TIMESTAMP: - case SQL_BLOB: - lua_pushstring(L, "string"); - break; - case SQL_SHORT: - case SQL_LONG: - case SQL_INT64: -#if LUA_VERSION_NUM>=503 - lua_pushstring(L, "integer"); - break; -#endif - case SQL_FLOAT: - case SQL_DOUBLE: - lua_pushstring(L, "number"); - break; - default: - lua_pushstring(L, "unknown"); - break; - } - lua_settable(L, -3); - } - - return 1; -} - -/* -** Closes a cursor object -** Lua Returns: -** 1 if close was sucsessful, 0 if already closed -** nil and error message otherwise. -*/ -static int cur_close (lua_State *L) { - cur_data *cur = (cur_data *)luaL_checkudata(L,1,LUASQL_CURSOR_FIREBIRD); - luaL_argcheck (L, cur != NULL, 1, "cursor expected"); - int shut_res; - - if(cur->closed == 0) { - shut_res = cur_shut(L, cur); - if(shut_res > 0) { - return shut_res; - } - - /* return sucsess */ - lua_pushboolean(L, 1); - return 1; - } - - lua_pushboolean(L, 0); - return 1; -} - -/* -** GCs a cursor object -*/ -static int cur_gc (lua_State *L) { - cur_data *cur = (cur_data *)luaL_checkudata(L,1,LUASQL_CURSOR_FIREBIRD); - luaL_argcheck (L, cur != NULL, 1, "cursor expected"); - - if(cur->closed == 0) { - cur_shut(L, cur); - } - - return 0; -} - -/* -** Creates an Environment and returns it. -*/ -static int create_environment (lua_State *L) { - int i; - env_data *env; - - env = (env_data *)lua_newuserdata (L, sizeof (env_data)); - luasql_setmeta (L, LUASQL_ENVIRONMENT_FIREBIRD); - /* fill in structure */ - for(i=0; i<20; i++) - env->status_vector[i] = 0; - env->closed = 0; - env->lock = 0; - - return 1; -} - -/* -** Creates and returns a connection object -** Lua Input: source, user, pass -** source: data source -** user, pass: data source authentication information -** Lua Returns: -** connection object if successfull -** nil and error message otherwise. -*/ -static int env_connect (lua_State *L) { - char *dpb; - int i; - static char isc_tpb[] = { isc_tpb_version3, - isc_tpb_write }; - conn_data conn; - conn_data* res_conn; - - env_data *env = (env_data *) getenvironment (L, 1); - const char *sourcename = luaL_checkstring (L, 2); - const char *username = luaL_optstring (L, 3, ""); - const char *password = luaL_optstring (L, 4, ""); - - conn.env = env; - conn.db = 0L; - conn.transaction = 0L; - conn.lock = 0; - conn.autocommit = 0; - - /* Construct a database parameter buffer. */ - dpb = conn.dpb_buffer; - *dpb++ = isc_dpb_version1; - *dpb++ = isc_dpb_num_buffers; - *dpb++ = 1; - *dpb++ = 90; - - /* add the user name and password */ - *dpb++ = isc_dpb_user_name; - *dpb++ = (char)strlen(username); - for(i=0; i<(int)strlen(username); i++) - *dpb++ = username[i]; - *dpb++ = isc_dpb_password; - *dpb++ = (char)strlen(password); - for(i=0; i<(int)strlen(password); i++) - *dpb++ = password[i]; - - /* the length of the dpb */ - conn.dpb_length = (short)(dpb - conn.dpb_buffer); - - /* do the job */ - isc_attach_database(env->status_vector, (short)strlen(sourcename), (char*)sourcename, &conn.db, - conn.dpb_length, conn.dpb_buffer); - - /* an error? */ - if ( CHECK_DB_ERROR(conn.env->status_vector) ) - return return_db_error(L, conn.env->status_vector); - - /* open up the transaction handle */ - isc_start_transaction( env->status_vector, &conn.transaction, 1, - &conn.db, (unsigned short)sizeof(isc_tpb), - isc_tpb ); - - /* return NULL on error */ - if ( CHECK_DB_ERROR(conn.env->status_vector) ) - return return_db_error(L, conn.env->status_vector); - - /* create the lua object and add the connection to the lock */ - res_conn = (conn_data*)lua_newuserdata(L, sizeof(conn_data)); - luasql_setmeta (L, LUASQL_CONNECTION_FIREBIRD); - memcpy(res_conn, &conn, sizeof(conn_data)); - res_conn->closed = 0; /* connect now officially open */ - - /* register the connection */ - lua_registerobj(L, 1, env); - ++env->lock; - - return 1; -} - -/* -** Closes an environment object -** Lua Returns: -** 1 if close was sucsessful, 0 if already closed -** nil and error message otherwise. -*/ -static int env_close (lua_State *L) { - env_data *env = (env_data *)luaL_checkudata (L, 1, LUASQL_ENVIRONMENT_FIREBIRD); - luaL_argcheck (L, env != NULL, 1, "environment expected"); - - /* already closed? */ - if(env->closed == 1) { - lua_pushboolean(L, 0); - return 1; - } - - /* check the lock */ - if(env->lock > 0) - return luasql_faildirect(L, "there are still open connections"); - - /* unregister */ - lua_unregisterobj(L, env); - - /* mark as closed */ - env->closed = 1; - - lua_pushboolean(L, 1); - return 1; -} - -/* -** GCs an environment object -*/ -static int env_gc (lua_State *L) { - /* nothing to be done for the FB envronment */ - return 0; -} - -/* -** Create metatables for each class of object. -*/ -static void create_metatables (lua_State *L) { - struct luaL_Reg environment_methods[] = { - {"__gc", env_gc}, - {"close", env_close}, - {"connect", env_connect}, - {NULL, NULL}, - }; - struct luaL_Reg connection_methods[] = { - {"__gc", conn_gc}, - {"close", conn_close}, - {"execute", conn_execute}, - {"commit", conn_commit}, - {"rollback", conn_rollback}, - {"setautocommit", conn_setautocommit}, - {"escape", conn_escape}, - {NULL, NULL}, - }; - struct luaL_Reg cursor_methods[] = { - {"__gc", cur_gc}, - {"close", cur_close}, - {"fetch", cur_fetch}, - {"getcoltypes", cur_coltypes}, - {"getcolnames", cur_colnames}, - {NULL, NULL}, - }; - luasql_createmeta (L, LUASQL_ENVIRONMENT_FIREBIRD, environment_methods); - luasql_createmeta (L, LUASQL_CONNECTION_FIREBIRD, connection_methods); - luasql_createmeta (L, LUASQL_CURSOR_FIREBIRD, cursor_methods); - lua_pop (L, 3); -} - -/* -** Creates the metatables for the objects and registers the -** driver open method. -*/ -LUASQL_API int luaopen_luasql_firebird (lua_State *L) { - struct luaL_Reg driver[] = { - {"firebird", create_environment}, - {NULL, NULL}, - }; - create_metatables (L); - lua_newtable (L); - luaL_setfuncs (L, driver, 0); - luasql_set_info (L); - return 1; -} +/* +** LuaSQL, Firebird driver +** Authors: Scott Morgan +** ls_firebird.c +*/ + +#include /* The Firebird API*/ +#include /* For managing time values */ +#include +#include + +/* Lua API */ +#include +#include + +#include "luasql.h" + +#define LUASQL_ENVIRONMENT_FIREBIRD "Firebird environment" +#define LUASQL_CONNECTION_FIREBIRD "Firebird connection" +#define LUASQL_CURSOR_FIREBIRD "Firebird cursor" + +typedef struct { + short closed; + ISC_STATUS status_vector[20]; /* for error results */ + int lock; /* lock count for open connections */ +} env_data; + +typedef struct { + short closed; + env_data* env; /* the DB environment this is in */ + isc_db_handle db; /* the database handle */ + char dpb_buffer[256];/* holds the database parameter buffer */ + short dpb_length; /* the used amount of the dpb */ + isc_tr_handle transaction; /* the transaction handle */ + int lock; /* lock count for open cursors */ + int autocommit; /* should each statement be committed */ +} conn_data; + +typedef struct { + short closed; + env_data* env; /* the DB environment this is in */ + conn_data* conn; /* the DB connection this cursor is from */ + isc_stmt_handle stmt; /* the statement handle */ + int stmt_type; /* the type of the statement */ + XSQLDA *out_sqlda; /* the cursor data array */ +} cur_data; + +/* How many fields to pre-alloc to the cursor */ +#define CURSOR_PREALLOC 10 + +/* Macro to ease code reading */ +#define CHECK_DB_ERROR( X ) ( (X)[0] == 1 && (X)[1] ) + +/* Use the new interpret API if available */ +#undef FB_INTERPRET +#if FB_API_VER >= 20 + #define FB_INTERPRET(BUF, LEN, VECTOR) fb_interpret(BUF, LEN, VECTOR) +#else + #define FB_INTERPRET(BUF, LEN, VECTOR) isc_interpret(BUF, VECTOR) +#endif + +#if LUA_VERSION_NUM>=503 +#define luasql_pushinteger lua_pushinteger +#else +#define luasql_pushinteger lua_pushnumber +#endif + +/* +** Returns a standard database error message +*/ +static int return_db_error(lua_State *L, const ISC_STATUS *pvector) +{ + char errmsg[512]; + + lua_pushnil(L); + FB_INTERPRET(errmsg, 512, &pvector); + lua_pushstring(L, errmsg); + while(FB_INTERPRET(errmsg, 512, &pvector)) { + lua_pushstring(L, "\n * "); + lua_pushstring(L, errmsg); + lua_concat(L, 3); + } + + return 2; +} + +/* +** Registers a given C object in the registry to avoid GC +*/ +static void lua_registerobj(lua_State *L, int index, void *obj) +{ + lua_pushvalue(L, index); + lua_pushlightuserdata(L, obj); + lua_pushvalue(L, -2); + lua_settable(L, LUA_REGISTRYINDEX); + lua_pop(L, 1); +} + +/* +** Unregisters a given C object from the registry +*/ +static void lua_unregisterobj(lua_State *L, void *obj) +{ + lua_pushlightuserdata(L, obj); + lua_pushnil(L); + lua_settable(L, LUA_REGISTRYINDEX); +} + +/* +** Free's up the memory alloc'd to the cursor data +*/ +static void free_cur(cur_data* cur) +{ + int i; + XSQLVAR *var; + + /* free the field memory blocks */ + for (i=0, var = cur->out_sqlda->sqlvar; i < cur->out_sqlda->sqld; i++, var++) { + free(var->sqldata); + if(var->sqlind != NULL) + free(var->sqlind); + } + + /* free the data array */ + free(cur->out_sqlda); +} + +/* +** Shuts down a cursor +*/ +static int cur_shut(lua_State *L, cur_data *cur) +{ + isc_dsql_free_statement(cur->env->status_vector, &cur->stmt, + DSQL_close); + if ( CHECK_DB_ERROR(cur->env->status_vector) ) { + return return_db_error(L, cur->env->status_vector); + } + + /* free the cursor data */ + free_cur(cur); + + /* remove cursor from lock count and check if statement can be unregistered */ + cur->closed = 1; + --cur->conn->lock; + + /* check if connection can be unregistered */ + if(cur->conn->lock == 0) + lua_unregisterobj(L, cur->conn); + + return 0; +} + +/* +** Check for valid environment. +*/ +static env_data *getenvironment (lua_State *L, int i) { + env_data *env = (env_data *)luaL_checkudata (L, i, LUASQL_ENVIRONMENT_FIREBIRD); + luaL_argcheck (L, env != NULL, i, "environment expected"); + luaL_argcheck (L, !env->closed, i, "environment is closed"); + return env; +} + +/* +** Check for valid connection. +*/ +static conn_data *getconnection (lua_State *L, int i) { + conn_data *conn = (conn_data *)luaL_checkudata (L, i, LUASQL_CONNECTION_FIREBIRD); + luaL_argcheck (L, conn != NULL, i, "connection expected"); + luaL_argcheck (L, !conn->closed, i, "connection is closed"); + return conn; +} + +/* +** Check for valid cursor. +*/ +static cur_data *getcursor (lua_State *L, int i) { + cur_data *cur = (cur_data *)luaL_checkudata (L, i, LUASQL_CURSOR_FIREBIRD); + luaL_argcheck (L, cur != NULL, i, "cursor expected"); + luaL_argcheck (L, !cur->closed, i, "cursor is closed"); + return cur; +} + +/* +** Returns the statement type +*/ +static int get_statement_type(cur_data* cur) +{ + int length, type; + char type_item[] = { isc_info_sql_stmt_type }; + char res_buffer[88], *pres; + + pres = res_buffer; + + isc_dsql_sql_info( cur->env->status_vector, &cur->stmt, + sizeof(type_item), type_item, + sizeof(res_buffer), res_buffer ); + if (cur->env->status_vector[0] == 1 && cur->env->status_vector[1] > 0) + return -1; + + /* check the type of the statement */ + if (*pres == isc_info_sql_stmt_type) + { + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + type = isc_vax_integer(pres, length); + pres += length; + } else + return -2; /* should have had the isc_info_sql_stmt_type info */ + + return type; +} + +/* +** Return the number of rows affected by last operation +*/ +static int count_rows_affected(cur_data* cur) +{ + int length, type, res=0; + int del_count = 0, ins_count = 0, upd_count = 0, sel_count = 0; + char type_item[] = { isc_info_sql_stmt_type, isc_info_sql_records }; + char res_buffer[88], *pres; + + pres = res_buffer; + + isc_dsql_sql_info( cur->env->status_vector, &cur->stmt, + sizeof(type_item), type_item, + sizeof(res_buffer), res_buffer ); + if (cur->env->status_vector[0] == 1 && cur->env->status_vector[1] > 0) + return -1; + + /* check the type of the statement */ + if (*pres == isc_info_sql_stmt_type) + { + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + type = isc_vax_integer(pres, length); + pres += length; + } else + return -2; /* should have had the isc_info_sql_stmt_type info */ + + if(type > 4) + return 0; /* not a SELECT, INSERT, UPDATE or DELETE SQL statement */ + + if (*pres == isc_info_sql_records) + { + pres++; + length = isc_vax_integer(pres, 2); /* normally 29 bytes */ + pres += 2; + + while(*pres != 1) { + switch(*pres) { + case isc_info_req_select_count: + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + sel_count = isc_vax_integer(pres, length); + pres += length; + break; + case isc_info_req_insert_count: + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + ins_count = isc_vax_integer(pres, length); + pres += length; + break; + case isc_info_req_update_count: + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + upd_count = isc_vax_integer(pres, length); + pres += length; + break; + case isc_info_req_delete_count: + pres++; + length = isc_vax_integer(pres, 2); + pres += 2; + del_count = isc_vax_integer(pres, length); + pres += length; + break; + default: + pres++; + break; + } + } + } else + return -3; + + switch(type) { + case isc_info_sql_stmt_select: + res = sel_count; + break; + case isc_info_sql_stmt_delete: + res = del_count; + break; + case isc_info_sql_stmt_update: + res = upd_count; + break; + case isc_info_sql_stmt_insert: + res = ins_count; + break; + } + return res; +} + +static void *malloc_zero(size_t len) +{ + void *res = malloc(len); + memset(res, 0, len); + return res; +} + +/* +** Executes a SQL statement. +** Returns +** cursor object: if there are results or +** row count: number of rows affected by statement if no results +*/ +static int conn_execute (lua_State *L) { + conn_data *conn = getconnection(L,1); + const char *statement = luaL_checkstring(L, 2); + int dialect = (int)luaL_optnumber(L, 3, 3); + + XSQLVAR *var; + long dtype; + int i, n, count; + + cur_data cur; + + cur.closed = 0; + cur.env = conn->env; + cur.conn = conn; + cur.stmt = 0; + + cur.out_sqlda = (XSQLDA *)malloc(XSQLDA_LENGTH(CURSOR_PREALLOC)); + cur.out_sqlda->version = SQLDA_VERSION1; + cur.out_sqlda->sqln = CURSOR_PREALLOC; + + /* create a statement to handle the query */ + isc_dsql_allocate_statement(conn->env->status_vector, &conn->db, &cur.stmt); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + free(cur.out_sqlda); + return return_db_error(L, conn->env->status_vector); + } + + /* process the SQL ready to run the query */ + isc_dsql_prepare(conn->env->status_vector, &conn->transaction, &cur.stmt, 0, (char*)statement, dialect, cur.out_sqlda); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + free(cur.out_sqlda); + return return_db_error(L, conn->env->status_vector); + } + + /* what type of SQL statement is it? */ + cur.stmt_type = get_statement_type(&cur); + if(cur.stmt_type < 0) { + free(cur.out_sqlda); + return return_db_error(L, conn->env->status_vector); + } + + /* an unsupported SQL statement (something like COMMIT) */ + switch(cur.stmt_type) { + case isc_info_sql_stmt_select: + case isc_info_sql_stmt_insert: + case isc_info_sql_stmt_update: + case isc_info_sql_stmt_delete: + case isc_info_sql_stmt_ddl: + case isc_info_sql_stmt_exec_procedure: + break; + default: + free(cur.out_sqlda); + return luasql_faildirect(L, "unsupported SQL statement"); + } + + /* resize the result set if needed */ + if (cur.out_sqlda->sqld > cur.out_sqlda->sqln) + { + n = cur.out_sqlda->sqld; + free(cur.out_sqlda); + cur.out_sqlda = (XSQLDA *)malloc(XSQLDA_LENGTH(n)); + cur.out_sqlda->sqln = n; + cur.out_sqlda->version = SQLDA_VERSION1; + isc_dsql_describe(conn->env->status_vector, &cur.stmt, 1, cur.out_sqlda); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + free(cur.out_sqlda); + return return_db_error(L, conn->env->status_vector); + } + } + + /* prep the result set ready to handle the data */ + for (i=0, var = cur.out_sqlda->sqlvar; i < cur.out_sqlda->sqld; i++, var++) { + dtype = (var->sqltype & ~1); /* drop flag bit for now */ + switch(dtype) { + case SQL_VARYING: + var->sqldata = (char *)malloc_zero(sizeof(char)*var->sqllen + 2); + break; + case SQL_TEXT: + var->sqldata = (char *)malloc_zero(sizeof(char)*var->sqllen); + break; + case SQL_SHORT: + var->sqldata = (char *)malloc_zero(sizeof(ISC_SHORT)); + break; + case SQL_LONG: + var->sqldata = (char *)malloc_zero(sizeof(ISC_LONG)); + break; + case SQL_INT64: + var->sqldata = (char *)malloc_zero(sizeof(ISC_INT64)); + break; + case SQL_FLOAT: + var->sqldata = (char *)malloc_zero(sizeof(float)); + break; + case SQL_DOUBLE: + var->sqldata = (char *)malloc_zero(sizeof(double)); + break; + case SQL_TYPE_TIME: + var->sqldata = (char *)malloc_zero(sizeof(ISC_TIME)); + break; + case SQL_TYPE_DATE: + var->sqldata = (char *)malloc_zero(sizeof(ISC_DATE)); + break; + case SQL_TIMESTAMP: + var->sqldata = (char *)malloc_zero(sizeof(ISC_TIMESTAMP)); + break; + case SQL_BLOB: + var->sqldata = (char *)malloc_zero(sizeof(ISC_QUAD)); + break; + /* TODO : add extra data type handles here */ + } + + if (var->sqltype & 1) { + /* allocate variable to hold NULL status */ + var->sqlind = (short *)malloc(sizeof(short)); + } else { + var->sqlind = NULL; + } + } + + /* run the query */ + isc_dsql_execute(conn->env->status_vector, &conn->transaction, &cur.stmt, 1, NULL); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + free_cur(&cur); + return return_db_error(L, conn->env->status_vector); + } + + /* if autocommit is set and it's a non SELECT query, commit change */ + if(conn->autocommit != 0 && cur.stmt_type > 1) { + isc_commit_retaining(conn->env->status_vector, &conn->transaction); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + free_cur(&cur); + return return_db_error(L, conn->env->status_vector); + } + } + + /* what do we return? a cursor or a count */ + if(cur.out_sqlda->sqld > 0) { /* a cursor */ + char cur_name[32]; + cur_data* user_cur = (cur_data*)LUASQL_NEWUD(L, sizeof(cur_data)); + luasql_setmeta (L, LUASQL_CURSOR_FIREBIRD); + + sprintf(cur_name, "dyn_cursor_%p", (void *)user_cur); + + /* open the cursor ready for fetch cycles */ + isc_dsql_set_cursor_name(cur.env->status_vector, &cur.stmt, cur_name, 0); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) { + lua_pop(L, 1); /* the userdata */ + free_cur(&cur); + return return_db_error(L, conn->env->status_vector); + } + + /* copy the cursor into a new lua userdata object */ + memcpy((void*)user_cur, (void*)&cur, sizeof(cur_data)); + + /* add cursor to the lock count */ + lua_registerobj(L, 1, conn); + ++conn->lock; + } else { /* a count */ + if( (count = count_rows_affected(&cur)) < 0 ) { + free(cur.out_sqlda); + return return_db_error(L, conn->env->status_vector); + } + + lua_pushnumber(L, count); + + /* totally finished with the cursor */ + isc_dsql_free_statement(conn->env->status_vector, &cur.stmt, DSQL_drop); + free(cur.out_sqlda); + } + + return 1; +} + +/* +** Commits the current transaction +*/ +static int conn_commit(lua_State *L) { + conn_data *conn = getconnection(L,1); + + isc_commit_retaining(conn->env->status_vector, &conn->transaction); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) + return return_db_error(L, conn->env->status_vector); + + lua_pushboolean(L, 1); + return 1; +} + +/* +** Rolls back the current transaction +** Lua Returns: +** 1 if rollback is successful +** nil and error message otherwise. +*/ +static int conn_rollback(lua_State *L) { + conn_data *conn = getconnection(L,1); + + isc_rollback_retaining(conn->env->status_vector, &conn->transaction); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) + return return_db_error(L, conn->env->status_vector); + + lua_pushboolean(L, 1); + return 1; +} + +/* +** Sets the autocommit state of the connection +** Lua Returns: +** autocommit state (0:off, 1:on) +** nil and error message on error. +*/ +static int conn_setautocommit(lua_State *L) { + conn_data *conn = getconnection(L,1); + + if(lua_toboolean(L, 2)) + conn->autocommit = 1; + else + conn->autocommit = 0; + + lua_pushboolean(L, 1); + return 1; +} + +/* +** Closes a connection. +** Lua Returns: +** 1 if close was sucsessful, 0 if already closed +** nil and error message otherwise. +*/ +static int conn_close (lua_State *L) { + conn_data *conn = (conn_data *)luaL_checkudata(L,1,LUASQL_CONNECTION_FIREBIRD); + luaL_argcheck (L, conn != NULL, 1, "connection expected"); + + /* already closed */ + if(conn->closed != 0) { + lua_pushboolean(L, 0); + lua_pushstring(L, "Connection is already closed"); + return 2; + } + + /* are all related cursors closed? */ + if(conn->lock > 0) + return luasql_faildirect(L, "there are still open cursors"); + + if(conn->autocommit != 0) + isc_commit_transaction(conn->env->status_vector, &conn->transaction); + else + isc_rollback_transaction(conn->env->status_vector, &conn->transaction); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) + return return_db_error(L, conn->env->status_vector); + + isc_detach_database(conn->env->status_vector, &conn->db); + if ( CHECK_DB_ERROR(conn->env->status_vector) ) + return return_db_error(L, conn->env->status_vector); + + conn->closed = 1; + --conn->env->lock; + + /* check environment can be GC'd */ + if(conn->env->lock == 0) + lua_unregisterobj(L, conn->env); + + lua_pushboolean(L, 1); + return 1; +} + +/* +** GCs an connection object +*/ +static int conn_gc (lua_State *L) { + conn_data *conn = (conn_data *)luaL_checkudata(L,1,LUASQL_CONNECTION_FIREBIRD); + + if(conn->closed == 0) { + if(conn->autocommit != 0) + isc_commit_transaction(conn->env->status_vector, &conn->transaction); + else + isc_rollback_transaction(conn->env->status_vector, &conn->transaction); + + isc_detach_database(conn->env->status_vector, &conn->db); + + conn->closed = 1; + --conn->env->lock; + + /* check environment can be GC'd */ + if(conn->env->lock == 0) + lua_unregisterobj(L, conn->env); + } + + return 0; +} + +/* +** Escapes a given string so that it can't break out of it's delimiting quotes +*/ +static int conn_escape(lua_State *L) { + size_t len; + const char *from = luaL_checklstring (L, 2, &len); + char *res = malloc(len*sizeof(char)*2+1); + char *to = res; + + if(res) { + while(*from != '\0') { + *(to++) = *from; + if(*from == '\'') + *(to++) = *from; + + from++; + } + *to = '\0'; + + lua_pushstring(L, res); + free(res); + return 1; + } + + luaL_error(L, "could not allocate escaped string"); + return 0; +} + +/* +** Pushes the indexed value onto the lua stack +*/ +static void push_column(lua_State *L, int i, cur_data *cur) { + int varcharlen; + struct tm timevar; + char timestr[256]; + ISC_STATUS blob_stat; + isc_blob_handle blob_handle = 0; + ISC_QUAD blob_id; + luaL_Buffer b; + char *buffer; + unsigned short actual_seg_len; + + if( (cur->out_sqlda->sqlvar[i].sqlind != NULL) && + (*(cur->out_sqlda->sqlvar[i].sqlind) != 0) ) { + /* a null field? */ + lua_pushnil(L); + } else { + switch(cur->out_sqlda->sqlvar[i].sqltype & ~1) { + case SQL_VARYING: + varcharlen = (int)isc_vax_integer(cur->out_sqlda->sqlvar[i].sqldata, 2); + lua_pushlstring(L, cur->out_sqlda->sqlvar[i].sqldata+2, varcharlen); + break; + case SQL_TEXT: + lua_pushlstring(L, cur->out_sqlda->sqlvar[i].sqldata, cur->out_sqlda->sqlvar[i].sqllen); + break; + case SQL_SHORT: + luasql_pushinteger(L, *(ISC_SHORT*)(cur->out_sqlda->sqlvar[i].sqldata)); + break; + case SQL_LONG: + luasql_pushinteger(L, *(ISC_LONG*)(cur->out_sqlda->sqlvar[i].sqldata)); + break; + case SQL_INT64: + luasql_pushinteger(L, *(ISC_INT64*)(cur->out_sqlda->sqlvar[i].sqldata)); + break; + case SQL_FLOAT: + lua_pushnumber(L, *(float*)(cur->out_sqlda->sqlvar[i].sqldata)); + break; + case SQL_DOUBLE: + lua_pushnumber(L, *(double*)(cur->out_sqlda->sqlvar[i].sqldata)); + break; + case SQL_TYPE_TIME: + isc_decode_sql_time((ISC_TIME*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); + strftime(timestr, 255, "%X", &timevar); + lua_pushstring(L, timestr); + break; + case SQL_TYPE_DATE: + isc_decode_sql_date((ISC_DATE*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); + strftime(timestr, 255, "%x", &timevar); + lua_pushstring(L, timestr); + break; + case SQL_TIMESTAMP: + isc_decode_timestamp((ISC_TIMESTAMP*)(cur->out_sqlda->sqlvar[i].sqldata), &timevar); + strftime(timestr, 255, "%x %X", &timevar); + lua_pushstring(L, timestr); + break; + case SQL_BLOB: + /* get the BLOB ID and open it */ + memcpy(&blob_id, cur->out_sqlda->sqlvar[i].sqldata, sizeof(ISC_QUAD)); + isc_open_blob2( cur->env->status_vector, + &cur->conn->db, &cur->conn->transaction, + &blob_handle, &blob_id, 0, NULL ); + /* fetch the blob data */ + luaL_buffinit(L, &b); + buffer = luaL_prepbuffer(&b); + + blob_stat = isc_get_segment( cur->env->status_vector, + &blob_handle, &actual_seg_len, + LUAL_BUFFERSIZE, buffer ); + while(blob_stat == 0 || cur->env->status_vector[1] == isc_segment) { + luaL_addsize(&b, actual_seg_len); + buffer = luaL_prepbuffer(&b); + blob_stat = isc_get_segment( cur->env->status_vector, + &blob_handle, &actual_seg_len, + LUAL_BUFFERSIZE, buffer ); + } + + /* finished, close the BLOB */ + isc_close_blob(cur->env->status_vector, &blob_handle); + blob_handle = 0; + + luaL_pushresult(&b); + break; + default: + lua_pushstring(L, ""); + break; + } + } +} + +/* +** Returns a row of data from the query +** Lua Returns: +** list of results or table of results depending on call +** nil and error message otherwise. +*/ +static int cur_fetch (lua_State *L) { + ISC_STATUS fetch_stat; + int i, res; + cur_data *cur = (cur_data *)luaL_checkudata (L, 1, LUASQL_CURSOR_FIREBIRD); + const char *opts = luaL_optstring (L, 3, "n"); + int num = strchr(opts, 'n') != NULL; + int alpha = strchr(opts, 'a') != NULL; + + /* check cursor status */ + luaL_argcheck (L, cur != NULL, 1, "cursor expected"); + if (cur->closed) { + return 0; + } + + if ((fetch_stat = isc_dsql_fetch(cur->env->status_vector, &cur->stmt, 1, cur->out_sqlda)) == 0) { + if (lua_istable (L, 2)) { + /* remove the option string */ + lua_settop(L, 2); + + /* loop through the columns */ + for (i = 0; i < cur->out_sqlda->sqld; i++) { + push_column(L, i, cur); + + if (num) { + lua_pushnumber(L, i+1); + lua_pushvalue(L, -2); + lua_settable(L, 2); + } + + if (alpha) { + lua_pushlstring(L, cur->out_sqlda->sqlvar[i].aliasname, cur->out_sqlda->sqlvar[i].aliasname_length); + lua_pushvalue(L, -2); + lua_settable(L, 2); + } + + lua_pop(L, 1); + } + + /* returning given table */ + res = 1; + } else { + for (i = 0; i < cur->out_sqlda->sqld; i++) + push_column(L, i, cur); + + /* returning a list of values */ + res = cur->out_sqlda->sqld; + } + + /* close cursor for procedures/returnings as they (currently) only + return one result, and error on subsequent fetches */ + if (cur->stmt_type == isc_info_sql_stmt_exec_procedure) { + int shut_res = cur_shut(L, cur); + if (shut_res != 0) { + return shut_res; + } + } + + return res; + } + + /* isc_dsql_fetch returns 100 if no more rows remain to be retrieved + so this can be ignored */ + if (fetch_stat != 100L) + return return_db_error(L, cur->env->status_vector); + + /* last row has been fetched, close cursor */ + isc_dsql_free_statement(cur->env->status_vector, &cur->stmt, DSQL_drop); + if ( CHECK_DB_ERROR(cur->env->status_vector) ) + return return_db_error(L, cur->env->status_vector); + + /* free the cursor data */ + free_cur(cur); + + cur->closed = 1; + + /* remove cursor from lock count */ + --cur->conn->lock; + + /* return sucsess */ + return 0; +} + +/* +** Returns a table of column names from the query +** Lua Returns: +** a table of column names +** nil and error message otherwise. +*/ +static int cur_colnames (lua_State *L) { + int i; + XSQLVAR *var; + cur_data *cur = getcursor(L,1); + + lua_newtable(L); + + for (i=1, var = cur->out_sqlda->sqlvar; i <= cur->out_sqlda->sqld; i++, var++) { + lua_pushnumber(L, i); + lua_pushlstring(L, var->aliasname, var->aliasname_length); + lua_settable(L, -3); + } + + return 1; +} + +/* +** Returns a table of column types from the query +** Lua Returns: +** a table of column types +** nil and error message otherwise. +*/ +static int cur_coltypes (lua_State *L) { + int i; + XSQLVAR *var; + cur_data *cur = getcursor(L,1); + + lua_newtable(L); + + for (i=1, var = cur->out_sqlda->sqlvar; i <= cur->out_sqlda->sqld; i++, var++) { + lua_pushnumber(L, i); + switch(var->sqltype & ~1) { + case SQL_VARYING: + case SQL_TEXT: + case SQL_TYPE_TIME: + case SQL_TYPE_DATE: + case SQL_TIMESTAMP: + case SQL_BLOB: + lua_pushstring(L, "string"); + break; + case SQL_SHORT: + case SQL_LONG: + case SQL_INT64: +#if LUA_VERSION_NUM>=503 + lua_pushstring(L, "integer"); + break; +#endif + case SQL_FLOAT: + case SQL_DOUBLE: + lua_pushstring(L, "number"); + break; + default: + lua_pushstring(L, "unknown"); + break; + } + lua_settable(L, -3); + } + + return 1; +} + +/* +** Closes a cursor object +** Lua Returns: +** 1 if close was sucsessful, 0 if already closed +** nil and error message otherwise. +*/ +static int cur_close (lua_State *L) { + cur_data *cur = (cur_data *)luaL_checkudata(L,1,LUASQL_CURSOR_FIREBIRD); + luaL_argcheck (L, cur != NULL, 1, "cursor expected"); + int shut_res; + + if (cur->closed == 0) { + shut_res = cur_shut(L, cur); + if (shut_res > 0) { + return shut_res; + } + + lua_pushboolean(L, 1); + return 1; + } + + lua_pushboolean(L, 0); + lua_pushstring(L, "cursor is already closed"); + return 2; +} + +/* +** GCs a cursor object +*/ +static int cur_gc (lua_State *L) { + cur_data *cur = (cur_data *)luaL_checkudata(L,1,LUASQL_CURSOR_FIREBIRD); + luaL_argcheck (L, cur != NULL, 1, "cursor expected"); + + if(cur->closed == 0) { + int shut_res = cur_shut(L, cur); + if (shut_res > 0) { + return shut_res; + } + } + + return 0; +} + +/* +** Creates an Environment and returns it. +*/ +static int create_environment (lua_State *L) { + int i; + env_data *env; + + env = (env_data *)LUASQL_NEWUD (L, sizeof (env_data)); + luasql_setmeta (L, LUASQL_ENVIRONMENT_FIREBIRD); + /* fill in structure */ + for(i=0; i<20; i++) + env->status_vector[i] = 0; + env->closed = 0; + env->lock = 0; + + return 1; +} + +/* +** Creates and returns a connection object +** Lua Input: source, user, pass +** source: data source +** user, pass: data source authentication information +** Lua Returns: +** connection object if successful +** nil and error message otherwise. +*/ +static int env_connect (lua_State *L) { + char *dpb; + int i; + static char isc_tpb[] = { isc_tpb_version3, + isc_tpb_write }; + conn_data conn; + conn_data* res_conn; + + env_data *env = (env_data *) getenvironment (L, 1); + const char *sourcename = luaL_checkstring (L, 2); + const char *username = luaL_optstring (L, 3, ""); + const char *password = luaL_optstring (L, 4, ""); + + conn.env = env; + conn.db = 0L; + conn.transaction = 0L; + conn.lock = 0; + conn.autocommit = 0; + + /* Construct a database parameter buffer. */ + dpb = conn.dpb_buffer; + *dpb++ = isc_dpb_version1; + *dpb++ = isc_dpb_num_buffers; + *dpb++ = 1; + *dpb++ = 90; + + /* add the user name and password */ + *dpb++ = isc_dpb_user_name; + *dpb++ = (char)strlen(username); + for(i=0; i<(int)strlen(username); i++) + *dpb++ = username[i]; + *dpb++ = isc_dpb_password; + *dpb++ = (char)strlen(password); + for(i=0; i<(int)strlen(password); i++) + *dpb++ = password[i]; + + /* the length of the dpb */ + conn.dpb_length = (short)(dpb - conn.dpb_buffer); + + /* do the job */ + isc_attach_database(env->status_vector, (short)strlen(sourcename), (char*)sourcename, &conn.db, + conn.dpb_length, conn.dpb_buffer); + + /* an error? */ + if ( CHECK_DB_ERROR(conn.env->status_vector) ) + return return_db_error(L, conn.env->status_vector); + + /* open up the transaction handle */ + isc_start_transaction( env->status_vector, &conn.transaction, 1, + &conn.db, (unsigned short)sizeof(isc_tpb), + isc_tpb ); + + /* return NULL on error */ + if ( CHECK_DB_ERROR(conn.env->status_vector) ) + return return_db_error(L, conn.env->status_vector); + + /* create the lua object and add the connection to the lock */ + res_conn = (conn_data*)LUASQL_NEWUD(L, sizeof(conn_data)); + luasql_setmeta (L, LUASQL_CONNECTION_FIREBIRD); + memcpy(res_conn, &conn, sizeof(conn_data)); + res_conn->closed = 0; /* connect now officially open */ + + /* register the connection */ + lua_registerobj(L, 1, env); + ++env->lock; + + return 1; +} + +/* +** Closes an environment object +** Lua Returns: +** 1 if close was sucsessful, 0 if already closed +** nil and error message otherwise. +*/ +static int env_close (lua_State *L) { + env_data *env = (env_data *)luaL_checkudata (L, 1, LUASQL_ENVIRONMENT_FIREBIRD); + luaL_argcheck (L, env != NULL, 1, "environment expected"); + + /* already closed? */ + if(env->closed) { + lua_pushboolean(L, 0); + lua_pushstring(L, "env is already closed"); + return 2; + } + + /* check the lock */ +/* + if(env->lock > 0) + return luasql_faildirect(L, "there are still open connections"); +*/ + if(env->lock > 0) { + lua_pushboolean(L, 0); + lua_pushstring(L, "there are open connections"); + return 2; + } + + /* unregister */ + lua_unregisterobj(L, env); + + /* mark as closed */ + env->closed = 1; + + lua_pushboolean(L, 1); + return 1; +} + +/* +** GCs an environment object +*/ +static int env_gc (lua_State *L) { + /* nothing to be done for the FB environment */ + return 0; +} + +/* +** Create metatables for each class of object. +*/ +static void create_metatables (lua_State *L) { + struct luaL_Reg environment_methods[] = { + {"__gc", env_gc}, + {"__close", env_gc}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; + struct luaL_Reg connection_methods[] = { + {"__gc", conn_gc}, + {"__close", conn_gc}, + {"close", conn_close}, + {"execute", conn_execute}, + {"commit", conn_commit}, + {"rollback", conn_rollback}, + {"setautocommit", conn_setautocommit}, + {"escape", conn_escape}, + {NULL, NULL}, + }; + struct luaL_Reg cursor_methods[] = { + {"__gc", cur_gc}, + {"__close", cur_gc}, + {"close", cur_close}, + {"fetch", cur_fetch}, + {"getcoltypes", cur_coltypes}, + {"getcolnames", cur_colnames}, + {NULL, NULL}, + }; + luasql_createmeta (L, LUASQL_ENVIRONMENT_FIREBIRD, environment_methods); + luasql_createmeta (L, LUASQL_CONNECTION_FIREBIRD, connection_methods); + luasql_createmeta (L, LUASQL_CURSOR_FIREBIRD, cursor_methods); + lua_pop (L, 3); +} + +/* +** Creates the metatables for the objects and registers the +** driver open method. +*/ +LUASQL_API int luaopen_luasql_firebird (lua_State *L) { + struct luaL_Reg driver[] = { + {"firebird", create_environment}, + {NULL, NULL}, + }; + create_metatables (L); + lua_newtable (L); + luaL_setfuncs (L, driver, 0); + luasql_set_info (L); + return 1; +} diff -pruN 2.6.0-3/src/ls_mysql.c 2.7.0-1/src/ls_mysql.c --- 2.6.0-3/src/ls_mysql.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_mysql.c 2025-04-23 23:51:04.000000000 +0000 @@ -325,7 +325,8 @@ static int cur_close (lua_State *L) { luaL_argcheck (L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); if (cur->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Cursor is already closed"); + return 2; } cur_nullify (L, cur); lua_pushboolean (L, 1); @@ -339,7 +340,7 @@ static int cur_close (lua_State *L) { ** a reference to it on the cursor structure. */ static void _pushtable (lua_State *L, cur_data *cur, size_t off) { - int *ref = (int *)((char *)cur + off); + int *ref = (int *)cur + off / sizeof(int); /* If colnames or coltypes do not exist, create both. */ if (*ref == LUA_NOREF) @@ -393,7 +394,7 @@ static int cur_seek (lua_State *L) { ** Create a new Cursor object and push it on top of the stack. */ static int create_cursor (lua_State *L, MYSQL *my_conn, int conn, MYSQL_RES *result, int cols) { - cur_data *cur = (cur_data *)lua_newuserdata(L, sizeof(cur_data)); + cur_data *cur = (cur_data *)LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_MYSQL); /* fill in structure */ @@ -431,9 +432,13 @@ static int conn_close (lua_State *L) { luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Connection is already closed"); + return 2; } - conn_gc (L); + /* Nullify structure fields. */ + conn->closed = 1; + luaL_unref (L, LUA_REGISTRYINDEX, conn->env); + mysql_close (conn->my_conn); lua_pushboolean (L, 1); return 1; } @@ -559,7 +564,7 @@ static int conn_getlastautoid (lua_State ** Create a new Connection object and push it on top of the stack. */ static int create_connection (lua_State *L, int env, MYSQL *const my_conn) { - conn_data *conn = (conn_data *)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data *)LUASQL_NEWUD(L, sizeof(conn_data)); luasql_setmeta (L, LUASQL_CONNECTION_MYSQL); /* fill in structure */ @@ -609,8 +614,11 @@ static int env_connect (lua_State *L) { ** */ static int env_gc (lua_State *L) { - env_data *env= (env_data *)luaL_checkudata (L, 1, LUASQL_ENVIRONMENT_MYSQL); if (env != NULL && !(env->closed)) + env_data *env= (env_data *)luaL_checkudata (L, 1, LUASQL_ENVIRONMENT_MYSQL); + if (env != NULL && !(env->closed)) { env->closed = 1; + mysql_library_end(); + } return 0; } @@ -623,10 +631,11 @@ static int env_close (lua_State *L) { luaL_argcheck (L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring(L, "Environment is already closed"); + return 2; } - mysql_library_end(); env->closed = 1; + mysql_library_end(); lua_pushboolean (L, 1); return 1; } @@ -637,25 +646,28 @@ static int env_close (lua_State *L) { */ static void create_metatables (lua_State *L) { struct luaL_Reg environment_methods[] = { - {"__gc", env_gc}, - {"close", env_close}, - {"connect", env_connect}, + {"__gc", env_gc}, + {"__close", env_gc}, + {"close", env_close}, + {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { - {"__gc", conn_gc}, - {"close", conn_close}, - {"ping", conn_ping}, - {"escape", escape_string}, - {"execute", conn_execute}, - {"commit", conn_commit}, - {"rollback", conn_rollback}, - {"setautocommit", conn_setautocommit}, + {"__gc", conn_gc}, + {"__close", conn_gc}, + {"close", conn_close}, + {"ping", conn_ping}, + {"escape", escape_string}, + {"execute", conn_execute}, + {"commit", conn_commit}, + {"rollback", conn_rollback}, + {"setautocommit", conn_setautocommit}, {"getlastautoid", conn_getlastautoid}, {NULL, NULL}, }; struct luaL_Reg cursor_methods[] = { {"__gc", cur_gc}, + {"__close", cur_gc}, {"close", cur_close}, {"getcolnames", cur_getcolnames}, {"getcoltypes", cur_getcoltypes}, @@ -677,7 +689,7 @@ static void create_metatables (lua_State ** Creates an Environment and returns it. */ static int create_environment (lua_State *L) { - env_data *env = (env_data *)lua_newuserdata(L, sizeof(env_data)); + env_data *env = (env_data *)LUASQL_NEWUD(L, sizeof(env_data)); luasql_setmeta (L, LUASQL_ENVIRONMENT_MYSQL); /* fill in structure */ diff -pruN 2.6.0-3/src/ls_oci8.c 2.7.0-1/src/ls_oci8.c --- 2.6.0-3/src/ls_oci8.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_oci8.c 2025-04-23 23:51:04.000000000 +0000 @@ -24,7 +24,6 @@ #define LUASQL_CONNECTION_OCI8 "Oracle connection" #define LUASQL_CURSOR_OCI8 "Oracle cursor" - typedef struct { short closed; int conn_counter; @@ -269,7 +268,7 @@ static int free_column_buffers (lua_Stat break; default: luaL_error (L, LUASQL_PREFIX"unknown type"); - /*printf("free_buffers(): Unknow Type: %d count: %d\n",cols.item[count].type, count );*/ + /*printf("free_buffers(): Unknown Type: %d count: %d\n",cols.item[count].type, count );*/ break; } return 0; @@ -400,7 +399,8 @@ static int cur_close (lua_State *L) { luaL_argcheck (L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); if (cur->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Cursor is already closed"); + return 2; } /* Deallocate buffers. */ @@ -522,10 +522,14 @@ static int conn_close (lua_State *L) { luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Connection is already closed"); + return 2; + } + if (conn->cur_counter > 0){ + lua_pushboolean (L, 0); + lua_pushstring (L, "There are open cursors"); + return 2; } - if (conn->cur_counter > 0) - return luaL_error (L, LUASQL_PREFIX"there are open cursors"); /* Nullify structure fields. */ conn->closed = 1; @@ -554,7 +558,7 @@ static int conn_close (lua_State *L) { static int create_cursor (lua_State *L, int o, conn_data *conn, OCIStmt *stmt, const char *text) { int i; env_data *env; - cur_data *cur = (cur_data *)lua_newuserdata(L, sizeof(cur_data)); + cur_data *cur = (cur_data *)LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_OCI8); conn->cur_counter++; @@ -726,7 +730,7 @@ static int env_connect (lua_State *L) { size_t userlen = (username) ? strlen(username) : 0; size_t passlen = (password) ? strlen(password) : 0; /* Alloc connection object */ - conn_data *conn = (conn_data *)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data *)LUASQL_NEWUD(L, sizeof(conn_data)); /* fill in structure */ luasql_setmeta (L, LUASQL_CONNECTION_OCI8); @@ -770,13 +774,17 @@ static int env_close (lua_State *L) { luaL_argcheck (L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Environment is already closed"); + return 2; + } + if (env->conn_counter > 0){ + lua_pushboolean (L, 0); + lua_pushstring (L, "There are open connections"); + return 2; } - if (env->conn_counter > 0) - return luaL_error (L, LUASQL_PREFIX"there are open connections"); env->closed = 1; - /* desalocar: env->errhp e env->envhp */ + /* release resources */ if (env->envhp) OCIHandleFree ((dvoid *)env->envhp, OCI_HTYPE_ENV); if (env->errhp) @@ -790,7 +798,7 @@ static int env_close (lua_State *L) { ** Creates an Environment and returns it. */ static int create_environment (lua_State *L) { - env_data *env = (env_data *)lua_newuserdata(L, sizeof(env_data)); + env_data *env = (env_data *)LUASQL_NEWUD(L, sizeof(env_data)); luasql_setmeta (L, LUASQL_ENVIRONMENT_OCI8); /* fill in structure */ env->closed = 0; @@ -819,12 +827,14 @@ static int create_environment (lua_State static void create_metatables (lua_State *L) { struct luaL_Reg environment_methods[] = { {"__gc", env_close}, /* Should this method be changed? */ + {"__close", env_close}, {"close", env_close}, {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { {"__gc", conn_close}, /* Should this method be changed? */ + {"__close", conn_close}, {"close", conn_close}, {"execute", conn_execute}, {"commit", conn_commit}, @@ -834,6 +844,7 @@ static void create_metatables (lua_State }; struct luaL_Reg cursor_methods[] = { {"__gc", cur_close}, /* Should this method be changed? */ + {"__close", cur_close}, {"close", cur_close}, {"getcolnames", cur_getcolnames}, {"getcoltypes", cur_getcoltypes}, diff -pruN 2.6.0-3/src/ls_odbc.c 2.7.0-1/src/ls_odbc.c --- 2.6.0-3/src/ls_odbc.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_odbc.c 2025-04-23 23:51:04.000000000 +0000 @@ -16,7 +16,7 @@ #include #elif defined(INFORMIX) #include "infxcli.h" -#elif defined(UNIXODBC) +#else #include "sql.h" #include "sqltypes.h" #include "sqlext.h" @@ -32,11 +32,11 @@ #define LUASQL_STATEMENT_ODBC "ODBC statement" #define LUASQL_CURSOR_ODBC "ODBC cursor" -/* holds data for paramter binding */ +/* holds data for parameter binding */ typedef struct { SQLPOINTER buf; - SQLINTEGER len; - SQLINTEGER type; + SQLLEN len; + SQLLEN type; } param_data; /* general form of the driver objects */ @@ -66,7 +66,7 @@ typedef struct { SQLHSTMT hstmt; /* statement handle */ SQLSMALLINT numparams; /* number of input parameters */ int paramtypes; /* reference to param type table */ - param_data *params; /* array of parater data */ + param_data *params; /* array of parameter data */ } stmt_data; typedef struct { @@ -297,6 +297,9 @@ static const char *sqltypetolua (const S case SQL_DATE: case SQL_INTERVAL: case SQL_TIMESTAMP: case SQL_LONGVARCHAR: case SQL_WCHAR: case SQL_WVARCHAR: case SQL_WLONGVARCHAR: +#if (ODBCVER >= 0x0350) + case SQL_GUID: +#endif return "string"; case SQL_BIGINT: case SQL_TINYINT: case SQL_INTEGER: case SQL_SMALLINT: @@ -324,7 +327,7 @@ static const char *sqltypetolua (const S ** hstmt: statement handle ** i: column number ** Returns: -** 0 if successfull, non-zero otherwise; +** 0 if successful, non-zero otherwise; */ static int push_column(lua_State *L, int coltypes, const SQLHSTMT hstmt, SQLUSMALLINT i) { @@ -500,7 +503,8 @@ static int cur_close (lua_State *L) if (cur->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Cursor is already closed"); + return 2; } if((res = cur_shut(L, cur)) != 0) { @@ -574,7 +578,7 @@ static int create_cursor (lua_State *L, lock_obj(L, stmt_i, stmt); - cur = (cur_data *) lua_newuserdata(L, sizeof(cur_data)); + cur = (cur_data *) LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_ODBC); /* fill in structure */ @@ -635,10 +639,13 @@ static int conn_close (lua_State *L) luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Connection is already closed"); + return 2; } if (conn->lock > 0) { - return luaL_error (L, LUASQL_PREFIX"there are open statements/cursors"); + lua_pushboolean (L, 0); + lua_pushstring (L, "There are open cursors"); + return 2; } /* Decrement connection counter on environment object */ @@ -685,7 +692,7 @@ static int raw_execute(lua_State *L, int return create_cursor(L, -1, stmt, numcols); } else { /* if action has no results (e.g., UPDATE) */ - SQLINTEGER numrows; + SQLLEN numrows; if(error(SQLRowCount(stmt->hstmt, &numrows))) { return fail(L, hSTMT, stmt->hstmt); } @@ -697,7 +704,7 @@ static int raw_execute(lua_State *L, int static int set_param(lua_State *L, stmt_data *stmt, int i, param_data *data) { - static SQLINTEGER cbNull = SQL_NULL_DATA; + static SQLLEN cbNull = SQL_NULL_DATA; switch(lua_type(L, -1)) { case LUA_TNIL: { @@ -774,7 +781,6 @@ static int set_param(lua_State *L, stmt_ */ static int raw_readparams_table(lua_State *L, stmt_data *stmt, int iparams) { - static SQLINTEGER cbNull = SQL_NULL_DATA; SQLSMALLINT i; param_data *data; int res = 0; @@ -802,7 +808,6 @@ static int raw_readparams_table(lua_Stat */ static int raw_readparams_args(lua_State *L, stmt_data *stmt, int arg, int ltop) { - static SQLINTEGER cbNull = SQL_NULL_DATA; SQLSMALLINT i; param_data *data; int res = 0; @@ -911,7 +916,7 @@ static int conn_prepare(lua_State *L) return ret; } - stmt = (stmt_data *)lua_newuserdata(L, sizeof(stmt_data)); + stmt = (stmt_data *)LUASQL_NEWUD(L, sizeof(stmt_data)); memset(stmt, 0, sizeof(stmt_data)); stmt->closed = 0; @@ -1036,7 +1041,7 @@ static int conn_setautocommit (lua_State */ static int create_connection (lua_State *L, int o, env_data *env, SQLHDBC hdbc) { - conn_data *conn = (conn_data *)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data *)LUASQL_NEWUD(L, sizeof(conn_data)); /* set auto commit mode */ SQLRETURN ret = SQLSetConnectAttr(hdbc, SQL_ATTR_AUTOCOMMIT, @@ -1065,7 +1070,7 @@ static int create_connection (lua_State ** source: data source ** user, pass: data source authentication information ** Lua Returns: -** connection object if successfull +** connection object if successful ** nil and error message otherwise. */ static int env_connect (lua_State *L) { @@ -1095,6 +1100,26 @@ static int env_connect (lua_State *L) { } /* +** Environment object collector function +*/ +static int env_gc (lua_State *L) +{ + SQLRETURN ret; + env_data *env = (env_data *)luaL_checkudata(L, 1, LUASQL_ENVIRONMENT_ODBC); + if (env != NULL && !(env->closed)) { + env->closed = 1; + ret = SQLFreeHandle (hENV, env->henv); + if (error (ret)) { + int ret2 = fail (L, hENV, env->henv); + env->henv = NULL; + return ret2; + } + } + return 0; +} + + +/* ** Closes an environment object */ static int env_close (lua_State *L) @@ -1104,18 +1129,21 @@ static int env_close (lua_State *L) luaL_argcheck (L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Environment is already closed"); + return 2; } if (env->lock > 0) { - return luaL_error (L, LUASQL_PREFIX"there are open connections"); + lua_pushboolean (L, 0); + lua_pushstring (L, "There are open connections"); + return 2; } env->closed = 1; ret = SQLFreeHandle (hENV, env->henv); if (error(ret)) { - int ret = fail(L, hENV, env->henv); + int ret2 = fail(L, hENV, env->henv); env->henv = NULL; - return ret; + return ret2; } return pass(L); } @@ -1126,13 +1154,15 @@ static int env_close (lua_State *L) */ static void create_metatables (lua_State *L) { struct luaL_Reg environment_methods[] = { - {"__gc", env_close}, /* Should this method be changed? */ + {"__gc", env_gc}, + {"__close", env_gc}, {"close", env_close}, {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { {"__gc", conn_close}, /* Should this method be changed? */ + {"__close", conn_close}, {"close", conn_close}, {"prepare", conn_prepare}, {"execute", conn_execute}, @@ -1143,13 +1173,15 @@ static void create_metatables (lua_State }; struct luaL_Reg statement_methods[] = { {"__gc", stmt_close}, /* Should this method be changed? */ + {"__close", stmt_close}, {"close", stmt_close}, {"execute", stmt_execute}, {"getparamtypes", stmt_paramtypes}, {NULL, NULL}, }; struct luaL_Reg cursor_methods[] = { - {"__gc", cur_close}, /* Should this method be changed? */ + {"__gc", cur_gc}, /* Should this method be changed? */ + {"__close", cur_gc}, {"close", cur_close}, {"fetch", cur_fetch}, {"getcoltypes", cur_coltypes}, @@ -1183,7 +1215,7 @@ static int create_environment (lua_State return ret; } - env = (env_data *)lua_newuserdata (L, sizeof (env_data)); + env = (env_data *)LUASQL_NEWUD (L, sizeof (env_data)); luasql_setmeta (L, LUASQL_ENVIRONMENT_ODBC); /* fill in structure */ env->closed = 0; diff -pruN 2.6.0-3/src/ls_postgres.c 2.7.0-1/src/ls_postgres.c --- 2.6.0-3/src/ls_postgres.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_postgres.c 2025-04-23 23:51:04.000000000 +0000 @@ -172,9 +172,10 @@ static int cur_close (lua_State *L) { luaL_argcheck (L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); if (cur->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "cursor is already closed"); + return 2; } - cur_nullify (L, cur); /* == cur_gc (L); */ + cur_nullify (L, cur); lua_pushboolean (L, 1); return 1; } @@ -248,7 +249,7 @@ static void create_coltypes (lua_State * ** a reference to it on the cursor structure. */ static void _pushtable (lua_State *L, cur_data *cur, size_t off, creator func) { - int *ref = (int *)((char *)cur + off); + int *ref = (int *)cur + off / sizeof(int); if (*ref != LUA_NOREF) lua_rawgeti (L, LUA_REGISTRYINDEX, *ref); else { @@ -292,7 +293,7 @@ static int cur_numrows (lua_State *L) { ** Create a new Cursor object and push it on top of the stack. */ static int create_cursor (lua_State *L, int conn, PGresult *result) { - cur_data *cur = (cur_data *)lua_newuserdata(L, sizeof(cur_data)); + cur_data *cur = (cur_data *)LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_PG); /* fill in structure */ @@ -351,9 +352,13 @@ static int conn_close (lua_State *L) { luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring(L, "Connection is already closed"); + return 2; } - conn_gc (L); + conn->closed = 1; + luaL_unref (L, LUA_REGISTRYINDEX, conn->env); + PQfinish (conn->pg_conn); + lua_pushboolean (L, 1); return 1; } @@ -482,7 +487,7 @@ static int conn_setautocommit (lua_State ** Create a new Connection object and push it on top of the stack. */ static int create_connection (lua_State *L, int env, PGconn *const pg_conn) { - conn_data *conn = (conn_data *)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data *)LUASQL_NEWUD(L, sizeof(conn_data)); luasql_setmeta (L, LUASQL_CONNECTION_PG); /* fill in structure */ @@ -547,9 +552,10 @@ static int env_close (lua_State *L) { luaL_argcheck (L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { lua_pushboolean (L, 0); - return 1; + lua_pushstring (L, "Environment is already closed"); + return 2; } - env_gc (L); + env->closed = 1; lua_pushboolean (L, 1); return 1; } @@ -562,12 +568,14 @@ static int env_close (lua_State *L) { static void create_metatables (lua_State *L) { struct luaL_Reg environment_methods[] = { {"__gc", env_gc}, + {"__close", env_gc}, {"close", env_close}, {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { {"__gc", conn_gc}, + {"__close", conn_gc}, {"close", conn_close}, {"escape", conn_escape}, {"execute", conn_execute}, @@ -578,6 +586,7 @@ static void create_metatables (lua_State }; struct luaL_Reg cursor_methods[] = { {"__gc", cur_gc}, + {"__close", cur_gc}, {"close", cur_close}, {"getcolnames", cur_getcolnames}, {"getcoltypes", cur_getcoltypes}, @@ -595,7 +604,7 @@ static void create_metatables (lua_State ** Creates an Environment and returns it. */ static int create_environment (lua_State *L) { - env_data *env = (env_data *)lua_newuserdata(L, sizeof(env_data)); + env_data *env = (env_data *)LUASQL_NEWUD(L, sizeof(env_data)); luasql_setmeta (L, LUASQL_ENVIRONMENT_PG); /* fill in structure */ diff -pruN 2.6.0-3/src/ls_sqlite.c 2.7.0-1/src/ls_sqlite.c --- 2.6.0-3/src/ls_sqlite.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_sqlite.c 2025-04-23 23:51:04.000000000 +0000 @@ -98,7 +98,7 @@ static void cur_nullify(lua_State *L, cu /* ** Finalizes the vm -** Return nil + errmsg or nil in case of sucess +** Return nil + errmsg or nil in case of success */ static int finalize(lua_State *L, cur_data *cur) { char *errmsg; @@ -196,8 +196,9 @@ static int cur_close(lua_State *L) { cur_data *cur = (cur_data *)luaL_checkudata(L, 1, LUASQL_CURSOR_SQLITE); luaL_argcheck(L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); if (cur->closed) { - lua_pushboolean(L, 0); - return 1; + lua_pushboolean (L, 0); + lua_pushstring (L, "cursor is already closed"); + return 2; } sqlite_finalize(cur->sql_vm, NULL); cur_nullify(L, cur); @@ -235,7 +236,7 @@ static int create_cursor(lua_State *L, i sqlite_vm *sql_vm, int numcols, const char **col_info) { int i; - cur_data *cur = (cur_data*)lua_newuserdata(L, sizeof(cur_data)); + cur_data *cur = (cur_data*)LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_SQLITE); /* increment cursor count for the connection creating this cursor */ @@ -278,10 +279,7 @@ static int create_cursor(lua_State *L, i static int conn_gc(lua_State *L) { conn_data *conn = (conn_data *)luaL_checkudata(L, 1, LUASQL_CONNECTION_SQLITE); if (conn != NULL && !(conn->closed)) { - if (conn->cur_counter > 0) { - return luaL_error (L, LUASQL_PREFIX"there are open cursors"); - } - + /* Nullify structure fields. */ conn->closed = 1; luaL_unref(L, LUA_REGISTRYINDEX, conn->env); @@ -294,15 +292,25 @@ static int conn_gc(lua_State *L) { /* ** Close a Connection object. */ -static int conn_close(lua_State *L) { +static int conn_close (lua_State *L) { conn_data *conn = (conn_data *)luaL_checkudata(L, 1, LUASQL_CONNECTION_SQLITE); luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) { - lua_pushboolean(L, 0); - return 1; + lua_pushboolean (L, 0); + lua_pushstring (L, "Connection is already closed"); + return 2; } - conn_gc(L); - lua_pushboolean(L, 1); + + if (conn->cur_counter > 0) { + lua_pushboolean (L, 0); + lua_pushstring (L, "There are open cursors"); + return 2; + } + conn->closed = 1; + luaL_unref (L, LUA_REGISTRYINDEX, conn->env); + sqlite_close (conn->sql_conn); + + lua_pushboolean (L, 1); return 1; } @@ -331,7 +339,7 @@ static int conn_execute(lua_State *L) { return 2; } - /* process first result to retrive query information and type */ + /* process first result to retrieve query information and type */ res = sqlite_step(vm, &numcols, NULL, &col_info); /* real query? if empty, must have numcols!=0 */ @@ -447,7 +455,7 @@ static int conn_setautocommit(lua_State ** Create a new Connection object and push it on top of the stack. */ static int create_connection(lua_State *L, int env, sqlite *sql_conn) { - conn_data *conn = (conn_data*)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data*)LUASQL_NEWUD(L, sizeof(conn_data)); luasql_setmeta(L, LUASQL_CONNECTION_SQLITE); /* fill in structure */ @@ -503,10 +511,12 @@ static int env_close (lua_State *L) { env_data *env = (env_data *)luaL_checkudata(L, 1, LUASQL_ENVIRONMENT_SQLITE); luaL_argcheck(L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { - lua_pushboolean(L, 0); - return 1; + lua_pushboolean (L, 0); + lua_pushstring (L, "Environment is already closed"); + return 2; } - env_gc(L); + env->closed = 1; + lua_pushboolean(L, 1); return 1; } @@ -530,12 +540,14 @@ static int conn_escape(lua_State *L) { static void create_metatables (lua_State *L) { struct luaL_Reg environment_methods[] = { {"__gc", env_gc}, + {"__close", env_gc}, {"close", env_close}, {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { {"__gc", conn_gc}, + {"__close", conn_gc}, {"close", conn_close}, {"escape", conn_escape}, {"execute", conn_execute}, @@ -546,6 +558,7 @@ static void create_metatables (lua_State }; struct luaL_Reg cursor_methods[] = { {"__gc", cur_gc}, + {"__close", cur_gc}, {"close", cur_close}, {"getcolnames", cur_getcolnames}, {"getcoltypes", cur_getcoltypes}, @@ -562,7 +575,7 @@ static void create_metatables (lua_State ** Creates an Environment and returns it. */ static int create_environment (lua_State *L) { - env_data *env = (env_data *)lua_newuserdata(L, sizeof(env_data)); + env_data *env = (env_data *)LUASQL_NEWUD(L, sizeof(env_data)); luasql_setmeta(L, LUASQL_ENVIRONMENT_SQLITE); /* fill in structure */ diff -pruN 2.6.0-3/src/ls_sqlite3.c 2.7.0-1/src/ls_sqlite3.c --- 2.6.0-3/src/ls_sqlite3.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/ls_sqlite3.c 2025-04-23 23:51:04.000000000 +0000 @@ -104,7 +104,7 @@ static void cur_nullify(lua_State *L, cu /* ** Finalizes the vm -** Return nil + errmsg or nil in case of sucess +** Return nil + errmsg or nil in case of success */ static int finalize(lua_State *L, cur_data *cur) { const char *errmsg; @@ -235,9 +235,12 @@ static int cur_close(lua_State *L) cur_data *cur = (cur_data *)luaL_checkudata(L, 1, LUASQL_CURSOR_SQLITE); luaL_argcheck(L, cur != NULL, 1, LUASQL_PREFIX"cursor expected"); if (cur->closed) { - lua_pushboolean(L, 0); - return 1; + lua_pushboolean (L, 0); + lua_pushstring(L, "cursor is already closed"); + return 2; } + + cur->closed = 1; sqlite3_finalize(cur->sql_vm); cur_nullify(L, cur); lua_pushboolean(L, 1); @@ -276,7 +279,7 @@ static int create_cursor(lua_State *L, i sqlite3_stmt *sql_vm, int numcols) { int i; - cur_data *cur = (cur_data*)lua_newuserdata(L, sizeof(cur_data)); + cur_data *cur = (cur_data*)LUASQL_NEWUD(L, sizeof(cur_data)); luasql_setmeta (L, LUASQL_CURSOR_SQLITE); /* increment cursor count for the connection creating this cursor */ @@ -324,9 +327,6 @@ static int conn_gc(lua_State *L) conn_data *conn = (conn_data *)luaL_checkudata(L, 1, LUASQL_CONNECTION_SQLITE); if (conn != NULL && !(conn->closed)) { - if (conn->cur_counter > 0) - return luaL_error (L, LUASQL_PREFIX"there are open cursors"); - /* Nullify structure fields. */ conn->closed = 1; luaL_unref(L, LUA_REGISTRYINDEX, conn->env); @@ -344,11 +344,21 @@ static int conn_close(lua_State *L) conn_data *conn = (conn_data *)luaL_checkudata(L, 1, LUASQL_CONNECTION_SQLITE); luaL_argcheck (L, conn != NULL, 1, LUASQL_PREFIX"connection expected"); if (conn->closed) - { - lua_pushboolean(L, 0); - return 1; - } - conn_gc(L); + { + lua_pushboolean(L, 0); + lua_pushstring(L, "Connection is already closed"); + return 2; + } + + if (conn->cur_counter > 0) + { + lua_pushboolean(L, 0); + lua_pushstring(L, "There are open cursors"); + return 2; + } + + conn->closed = 1; + lua_pushboolean(L, 1); return 1; } @@ -369,6 +379,109 @@ static int conn_escape(lua_State *L) return 1; } + +/* +** Bind one parameter. +** Supported are the data types nil, string, boolean, number. +*/ +static int set_param(lua_State *L, sqlite3_stmt *vm, int param_nr, int arg) +{ + int tt = lua_type(L, arg); + int rc = 0; + + switch (tt) { + case LUA_TNIL: + rc = sqlite3_bind_null(vm, param_nr); + break; + + case LUA_TSTRING: { + size_t s_len; + const char *s = lua_tolstring(L, arg, &s_len); + rc = sqlite3_bind_null(vm, param_nr); + rc = sqlite3_bind_text(vm, param_nr, s, s_len, SQLITE_TRANSIENT); + break; + } + + case LUA_TBOOLEAN: { + int val = lua_tointeger(L, arg); + rc = sqlite3_bind_int(vm, param_nr, val); + break; + } + + case LUA_TNUMBER: { +#if defined(lua_isinteger) + if (lua_isinteger(L, arg)) { + lua_Integer val = lua_tointeger(L, arg); + rc = sqlite3_bind_int64(vm, param_nr, val); + } else { +#endif + double val = lua_tonumber(L, arg); + rc = sqlite3_bind_double(vm, param_nr, val); +#if defined(lua_isinteger) + } +#endif + break; + } + + default: + luaL_error(L, LUASQL_PREFIX"unhandled data type %s in parameter binding", + lua_typename(L, tt)); + } + + return rc; +} + +static int raw_readparams_args(lua_State *L, sqlite3_stmt *vm, int arg, int ltop) +{ + int param_count, param_nr, rc = 0; + + param_count = sqlite3_bind_parameter_count(vm); + if (ltop - arg + 1 != param_count) + luaL_error(L, LUASQL_PREFIX"wrong number of parameters: expected=%d, given=%d", + param_count, ltop - arg + 1); + + for (param_nr=1; param_nr <= param_count; param_nr ++, arg ++) { + rc = set_param(L, vm, param_nr, arg); + if (rc) + break; + } + + return rc; +} + +/* +** Bind all parameters from the given table. +** The table indices can be integers or strings. +** Unbound parameters, or duplicate bindings are not detected. +*/ +static int raw_readparams_table(lua_State *L, sqlite3_stmt *vm, int arg) +{ + int param_nr, rc = 0, tt; + + lua_pushnil(L); + + while (lua_next(L, arg)) { // [arg]=table, [-2]=key, [-1]=val + tt = lua_type(L, -2); +#if defined(lua_isinteger) + if (tt == LUA_TNUMBER && lua_isinteger(L, -2)) { + param_nr = lua_tointeger(L, -2); + } else { +#endif + const char *param_name = lua_tostring(L, -2); + param_nr = sqlite3_bind_parameter_index(vm, param_name); + if (param_nr == 0) + luaL_error(L, LUASQL_PREFIX"binding to invalid parameter name %s\n", + param_name); +#if defined(lua_isinteger) + } +#endif + set_param(L, vm, param_nr, -1); + lua_pop(L, 1); + } + + return rc; +} + /* ** Execute an SQL statement. ** Return a Cursor object if the statement is a query, otherwise @@ -395,7 +508,21 @@ static int conn_execute(lua_State *L) return luasql_faildirect(L, errmsg); } - /* process first result to retrive query information and type */ + /* Bind parameters (if any) */ + int ltop = lua_gettop(L); + if (ltop > 2) { + if (ltop == 3 && lua_type(L, 3) == LUA_TTABLE) { + res = raw_readparams_table(L, vm, 3); + } else if (ltop >= 3) { + res = raw_readparams_args(L, vm, 3, ltop); + } else { + luaL_error(L, LUASQL_PREFIX"parameters are either one table or positional"); + } + if (res) + return res; + } + + /* process first result to retrieve query information and type */ res = sqlite3_step(vm); numcols = sqlite3_column_count(vm); @@ -522,7 +649,7 @@ static int conn_setautocommit(lua_State */ static int create_connection(lua_State *L, int env, sqlite3 *sql_conn) { - conn_data *conn = (conn_data*)lua_newuserdata(L, sizeof(conn_data)); + conn_data *conn = (conn_data*)LUASQL_NEWUD(L, sizeof(conn_data)); luasql_setmeta(L, LUASQL_CONNECTION_SQLITE); /* fill in structure */ @@ -616,9 +743,12 @@ static int env_close (lua_State *L) luaL_argcheck(L, env != NULL, 1, LUASQL_PREFIX"environment expected"); if (env->closed) { lua_pushboolean(L, 0); - return 1; + lua_pushstring(L, "env is already closed"); + return 2; } - env_gc(L); + + env->closed = 1; + lua_pushboolean(L, 1); return 1; } @@ -642,14 +772,17 @@ static void create_metatables (lua_State { struct luaL_Reg environment_methods[] = { {"__gc", env_gc}, + {"__close", env_gc}, {"close", env_close}, {"connect", env_connect}, {NULL, NULL}, }; struct luaL_Reg connection_methods[] = { {"__gc", conn_gc}, + {"__close", conn_gc}, {"close", conn_close}, {"escape", conn_escape}, +// {"prepare", conn_prepare}, {"execute", conn_execute}, {"commit", conn_commit}, {"rollback", conn_rollback}, @@ -659,6 +792,7 @@ static void create_metatables (lua_State }; struct luaL_Reg cursor_methods[] = { {"__gc", cur_gc}, + {"__close", cur_gc}, {"close", cur_close}, {"getcolnames", cur_getcolnames}, {"getcoltypes", cur_getcoltypes}, @@ -676,7 +810,7 @@ static void create_metatables (lua_State */ static int create_environment (lua_State *L) { - env_data *env = (env_data *)lua_newuserdata(L, sizeof(env_data)); + env_data *env = (env_data *)LUASQL_NEWUD(L, sizeof(env_data)); luasql_setmeta(L, LUASQL_ENVIRONMENT_SQLITE); /* fill in structure */ diff -pruN 2.6.0-3/src/luasql.c 2.7.0-1/src/luasql.c --- 2.6.0-3/src/luasql.c 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/luasql.c 2025-04-23 23:51:04.000000000 +0000 @@ -122,12 +122,12 @@ LUASQL_API void luasql_setmeta (lua_Stat */ LUASQL_API void luasql_set_info (lua_State *L) { lua_pushliteral (L, "_COPYRIGHT"); - lua_pushliteral (L, "Copyright (C) 2003-2020 Kepler Project"); + lua_pushliteral (L, "Copyright (C) 2003-2025 Kepler Project"); lua_settable (L, -3); lua_pushliteral (L, "_DESCRIPTION"); lua_pushliteral (L, "LuaSQL is a simple interface from Lua to a DBMS"); lua_settable (L, -3); lua_pushliteral (L, "_VERSION"); - lua_pushliteral (L, "LuaSQL 2.6.0 (for "LUA_VERSION")"); + lua_pushliteral (L, "LuaSQL 2.7.0 (for "LUA_VERSION")"); lua_settable (L, -3); } diff -pruN 2.6.0-3/src/luasql.h 2.7.0-1/src/luasql.h --- 2.6.0-3/src/luasql.h 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/src/luasql.h 2025-04-23 23:51:04.000000000 +0000 @@ -24,6 +24,13 @@ #define LUASQL_CONNECTION "Each driver must have a connection metatable" #define LUASQL_CURSOR "Each driver must have a cursor metatable" +// Macro to handle userdata creation across Lua versions +#if LUA_VERSION_NUM >= 504 +#define LUASQL_NEWUD(L, size) lua_newuserdatauv(L, size, 0) +#else +#define LUASQL_NEWUD(L, size) lua_newuserdata(L, size) +#endif + LUASQL_API int luasql_faildirect (lua_State *L, const char *err); LUASQL_API int luasql_failmsg (lua_State *L, const char *err, const char *m); LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods); diff -pruN 2.6.0-3/tests/firebird.lua 2.7.0-1/tests/firebird.lua --- 2.6.0-3/tests/firebird.lua 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/tests/firebird.lua 2025-04-23 23:51:04.000000000 +0000 @@ -11,7 +11,7 @@ local orig_create_table = create_table local orig_drop_table = drop_table --------------------------------------------------------------------- --- New metadata needs to be commited before it is used +-- New metadata needs to be committed before it is used --------------------------------------------------------------------- function create_table () orig_create_table() @@ -20,7 +20,7 @@ end function drop_table () -- Firebird prefers to keep DDL stuff (CREATE TABLE, etc.) - -- seperate. So we need a new transaction i.e. connection + -- separate. So we need a new transaction i.e. connection -- to work in assert(CONN:close ()) CONN = assert(ENV:connect (datasource, username, password)) diff -pruN 2.6.0-3/tests/mysql.lua 2.7.0-1/tests/mysql.lua --- 2.6.0-3/tests/mysql.lua 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/tests/mysql.lua 2025-04-23 23:51:04.000000000 +0000 @@ -2,7 +2,7 @@ -- MySQL specific tests and configurations. --------------------------------------------------------------------- -QUERYING_STRING_TYPE_NAME = "binary(65535)" +QUERYING_STRING_TYPE_NAME = "binary(262140)" --------------------------------------------------------------------- -- Seeks to an arbitrary row in a query result set. @@ -21,6 +21,8 @@ function seek () assert2('c', cur:fetch()) assert2(nil, cur:fetch()) cur:close() + -- Delete inserted rows + assert2 (3, CONN:execute"delete from t", "Couldn't delete inserted rows!") io.write (" seek") end diff -pruN 2.6.0-3/tests/odbc.lua 2.7.0-1/tests/odbc.lua --- 2.6.0-3/tests/odbc.lua 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/tests/odbc.lua 2025-04-23 23:51:04.000000000 +0000 @@ -4,7 +4,7 @@ QUERYING_STRING_TYPE_NAME = "string" -- The CREATE_TABLE_RETURN_VALUE and DROP_TABLE_RETURN_VALUE works --- with -1 on MS Acess Driver, and 0 on SQL Server Driver +-- with -1 on MS Access Driver, and 0 on SQL Server Driver CREATE_TABLE_RETURN_VALUE = -1 DROP_TABLE_RETURN_VALUE = -1 diff -pruN 2.6.0-3/tests/test.lua 2.7.0-1/tests/test.lua --- 2.6.0-3/tests/test.lua 2020-09-09 15:28:53.000000000 +0000 +++ 2.7.0-1/tests/test.lua 2025-04-23 23:51:04.000000000 +0000 @@ -130,6 +130,7 @@ function basic_test () assert2 (false, ENV:close()) -- Reopen the environment. ENV = ENV_OK (luasql[driver] ()) + -- Check connection object. local conn, err = ENV:connect (datasource, username, password) assert (conn, (err or '').." ("..datasource..")") @@ -172,6 +173,7 @@ end function create_table () -- Check SQL statements. CONN = CONN_OK (ENV:connect (datasource, username, password)) + CONN:execute"drop table t" -- Create t. local cmd = define_table(TOTAL_FIELDS) assert2 (CREATE_TABLE_RETURN_VALUE, CONN:execute (cmd)) @@ -181,6 +183,9 @@ end -- Fetch 2 values. --------------------------------------------------------------------- function fetch2 () + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) -- insert a record. assert2 (1, CONN:execute ("insert into t (f1, f2) values ('b', 'c')")) -- retrieve data. @@ -209,6 +214,9 @@ function fetch2 () assert2 (false, cur:close()) -- remove records. assert2 (2, CONN:execute ("delete from t where f1 in ('b', 'd')")) + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) end --------------------------------------------------------------------- @@ -216,6 +224,9 @@ end -- indexing. --------------------------------------------------------------------- function fetch_new_table () + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) -- insert elements. assert2 (1, CONN:execute ("insert into t (f1, f2, f3, f4) values ('a', 'b', 'c', 'd')")) assert2 (1, CONN:execute ("insert into t (f1, f2, f3, f4) values ('f', 'g', 'h', 'i')")) @@ -232,7 +243,7 @@ function fetch_new_table () assert2 (nil, row.f3) assert2 (nil, row.f4) row, err = cur:fetch(fetch_table()) - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 ('f', row[1]) assert2 ('g', row[2]) assert2 ('h', row[3]) @@ -249,7 +260,7 @@ function fetch_new_table () io.write ("reusing a table...") cur = CUR_OK (CONN:execute ("select f1, f2, f3, f4 from t order by f1")) local row, err = cur:fetch(fetch_table()) - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 ('a', row[1]) assert2 ('b', row[2]) assert2 ('c', row[3]) @@ -259,7 +270,7 @@ function fetch_new_table () assert2 (nil, row.f3) assert2 (nil, row.f4) row, err = cur:fetch (row) - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 ('f', row[1]) assert2 ('g', row[2]) assert2 ('h', row[3]) @@ -276,7 +287,7 @@ function fetch_new_table () io.write ("with alpha keys...") cur = CUR_OK (CONN:execute ("select f1, f2, f3, f4 from t order by f1")) local row, err = cur:fetch (fetch_table(), "a") - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 (nil, row[1]) assert2 (nil, row[2]) assert2 (nil, row[3]) @@ -303,7 +314,7 @@ function fetch_new_table () io.write ("with both keys...") cur = CUR_OK (CONN:execute ("select f1, f2, f3, f4 from t order by f1")) local row, err = cur:fetch (fetch_table(), "an") - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 ('a', row[1]) assert2 ('b', row[2]) assert2 ('c', row[3]) @@ -313,7 +324,7 @@ function fetch_new_table () assert2 ('c', row.f3) assert2 ('d', row.f4) row, err = cur:fetch (row, "an") - assert (type(row), "table", err) + assert2 (type(row), "table", err) assert2 ('f', row[1]) assert2 ('g', row[2]) assert2 ('h', row[3]) @@ -327,12 +338,18 @@ function fetch_new_table () assert2 (false, cur:close()) -- clean the table. assert2 (2, CONN:execute ("delete from t where f1 in ('a', 'f')")) + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) end --------------------------------------------------------------------- -- Fetch many values --------------------------------------------------------------------- function fetch_many () + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) -- insert values. local fields, values = "f1", "'v1'" for i = 2, TOTAL_FIELDS do @@ -395,11 +412,17 @@ function fetch_many () assert2 (false, cur:close(), MSG_CURSOR_NOT_CLOSED) -- clean the table. assert2 (1, CONN:execute ("delete from t where f1 = 'v1'")) + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) end --------------------------------------------------------------------- --------------------------------------------------------------------- function rollback () + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) -- begin transaction assert2 (true, CONN:setautocommit (false), "couldn't disable autocommit") -- insert a record and commit the operation. @@ -476,7 +499,8 @@ function column_info () for i = 1, table.getn(names) do assert2 ("f"..i, string.lower(names[i]), "incorrect column names table") local type_i = types[i] - assert (type_i == QUERYING_STRING_TYPE_NAME, "incorrect column types table") + type_i = string.lower(type_i) + assert2 (QUERYING_STRING_TYPE_NAME, type_i, "incorrect column types table") end -- check if the tables are being reused. local n2, t2 = cur:getcolnames(), cur:getcoltypes() @@ -504,16 +528,20 @@ function escape () local s1 = string.rep("'", n) local s2 = CONN:escape(s1) local s3 = s1:gsub ("'", "\\'") - assert (s1:len() == n) - assert (s2:len() == 2*n) + assert2 (n, s1:len(), "incorrect escaping of '"..s1.."': expected "..n.." bytes, but got "..s1:len()) + assert2 (2*n, s2:len(), "incerrect escaping of '"..s2.."': expected "..(2*n).." bytes, but got "..s2:len()) assert (s2 == s1..s1 or s2 == s3) io.write (" escape") end --------------------------------------------------------------------- +-- Check closing of various objects. --------------------------------------------------------------------- function check_close() + local cur0 = CUR_OK(CONN:execute"select count(*) from t") + assert2 (0, tonumber(cur0:fetch())) + cur0:close() -- an object with references to it can't be closed local cmd = "select * from t" local cur = CUR_OK(CONN:execute (cmd)) @@ -537,20 +565,68 @@ function check_close() collectgarbage () assert2(nil, a.CONN, "connection not collected") - -- check cursor integrity after trying to close a connection + -- check cursor integrity after trying to close its connection local conn = CONN_OK (ENV:connect (datasource, username, password)) assert2 (1, conn:execute"insert into t (f1) values (1)", "could not insert a new record") local cur = CUR_OK (conn:execute (cmd)) - local ok, err = pcall (conn.close, conn) + local ok, err, msg = pcall (conn.close, conn) + assert2 (true, ok, "couldn´t try to close the connection") + -- err could be true if the driver DOESN'T care about closing a connection + -- that has open cursors + -- err could be false if the driver DOES care about closing a connection + -- that has open cursors CUR_OK (cur) assert (cur:fetch(), "corrupted cursor") cur:close () conn:close () + -- The following check is failing in Firebird + --local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + --assert2 (1, tonumber (cur0:fetch())) + --cur0:close() + + -- check connection integrity after trying to close an environment + local conn = CONN_OK (ENV:connect (datasource, username, password)) + local closed = ENV:close() + --assert2 (true, ENV:close(), "couldn't close the environment!") + if closed then + -- Some drivers can close the environment with open connections + CONN_OK (conn) + local cmd = "select * from t" + local cur = CUR_OK(CONN:execute (cmd)) + assert2 ('1', cur:fetch(), "couldn't retrieve a row from `t`") + assert2 (true, cur:close(), "couldn't close the cursor!") + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (1, tonumber (cur0:fetch())) + cur0:close() + + assert2 (true, conn:close(), "couldn't close the connection!") + ENV = ENV_OK (luasql[driver] ()) + else + -- Some drivers cannot close the environment with open connections + conn:close() + ENV:close() + end +end + +--------------------------------------------------------------------- +-- Check support for to-be-closed variables. +-- Since this feature depends on a syntax construction not available +-- in versions prior to 5.4, this check should be written in another +-- file (or in a string). +--------------------------------------------------------------------- +function to_be_closed_support () + assert (loadfile"to_be_closed_support.lua")() end --------------------------------------------------------------------- --------------------------------------------------------------------- function drop_table () + -- check number of lines + -- The following check is failing with Firebird + --local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + --assert2 (1, tonumber (cur0:fetch())) + --assert2 (true, cur0:close(), "couldn't close the cursor") + assert2 (true, CONN:setautocommit(true), "couldn't enable autocommit") -- Postgres retorns 0, ODBC retorns -1, sqlite returns 1 assert2 (DROP_TABLE_RETURN_VALUE, CONN:execute ("drop table t")) @@ -559,8 +635,8 @@ end --------------------------------------------------------------------- --------------------------------------------------------------------- function close_conn () - assert (true, CONN:close()) - assert (true, ENV:close()) + assert2 (true, CONN:close()) + assert2 (true, ENV:close()) end --------------------------------------------------------------------- @@ -575,9 +651,17 @@ end EXTENSIONS = { } function extensions_test () + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) + for i, f in ipairs (EXTENSIONS) do f () end + + -- check number of lines + local cur0 = CUR_OK (CONN:execute ("select count(*) from t")) + assert2 (0, tonumber (cur0:fetch())) end --------------------------------------------------------------------- @@ -663,6 +747,7 @@ tests = { { "get column information", column_info }, { "extensions", extensions_test }, { "close objects", check_close }, +-- to-be-closed variables could be inserted here { "drop table", drop_table }, { "close connection", close_conn }, { "finalization", finalization }, @@ -677,6 +762,9 @@ if string.find(_VERSION, " 5.0") then end else luasql = require ("luasql."..driver) + if string.find(_VERSION, " 5.4") then + table.insert (tests, 10, { "to-be-closed support", to_be_closed_support }) + end end assert (luasql, "Could not load driver: no luasql table.") io.write (luasql._VERSION.." "..driver) diff -pruN 2.6.0-3/tests/to_be_closed_support.lua 2.7.0-1/tests/to_be_closed_support.lua --- 2.6.0-3/tests/to_be_closed_support.lua 1970-01-01 00:00:00.000000000 +0000 +++ 2.7.0-1/tests/to_be_closed_support.lua 2025-04-23 23:51:04.000000000 +0000 @@ -0,0 +1,14 @@ +--------------------------------------------------------------------- +-- Lua 5.4 support to to-be-closed variables. +--------------------------------------------------------------------- + +assert(CONN, "Unable to access CONN variable with a connection object!") + +local cursor = CONN:execute("select * from t") +CUR_OK (cursor) + +local connection = ENV:connect (datasource, username, password) +CONN_OK (connection) + +local environment = luasql[driver] () +ENV_OK (environment) \ No newline at end of file