lua/lua-luasql
SHA256
10
0
Fork 0
forked from pool/lua-luasql
Code Pull Requests Activity

- Update to 2.6.0:

Browse Source 
- Added read-only mode to SQLite3 and two new methods to MySQL
    fetch.
  - This release also added the library opening functions to
    luasql.h in order to ease the initialization process in C
    applications.
  - Added seek method to MySQL driver and bug-fix on ODBC driver
    number retrieval.
- Clean up luasql-fix-configuration.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-luasql?expand=0&rev=9
This commit is contained in:
Matej Cepl
2023-03-17 21:30:14 +00:00
committed by Matěj Cepl
parent 5a9d23248e
commit e8a4644ffb
5 changed files with 23 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lua-luasql.changes
View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Mar 17 18:24:52 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Update to 2.6.0:
- Added read-only mode to SQLite3 and two new methods to MySQL
fetch.
- This release also added the library opening functions to
luasql.h in order to ease the initialization process in C
applications.
- Added seek method to MySQL driver and bug-fix on ODBC driver
number retrieval.
- Clean up luasql-fix-configuration.patch
-------------------------------------------------------------------
Thu Mar 16 18:18:57 UTC 2023 - Matej Cepl <mcepl@suse.com>

7
lua-luasql.spec
View File

@@ -32,20 +32,19 @@ ExclusiveArch: do_not_build
%else
Name: %{flavor}-%{mod_name}
%endif
Version: 2.4.0
Version: 2.6.0
Release: 0
Summary: Simple interface from Lua to a DBMS
License: MIT
Group: Development/Libraries/Other
URL: https://github.com/lunarmodules/luasql
Source0: https://github.com/lunarmodules/luasql/archive/v%{version}/%{mod_name}-%{version}.tar.gz
#Source0 via https://codeload.github.com/keplerproject/luasql/tar.gz/v2.3.0
Source0: https://github.com/lunarmodules/luasql/archive/refs/tags/%{version}/%{mod_name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE luasql-fix-configuration.patch malcolmlewis@opensuse.org -- Clean up building and add rpm optflags.
Patch0: luasql-fix-configuration.patch
BuildRequires: %{flavor}-devel
BuildRequires: libiodbc-devel
BuildRequires: libmysqlclient-devel
BuildRequires: pkg-config
BuildRequires: pkgconf
BuildRequires: postgresql-devel
BuildRequires: sqlite3-devel
Requires: %{flavor}

3
luasql-2.4.0.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db2458a8c8c5f3bc717e4030fe2878f1ad8d71e437ec6149c381eebad5d525c5
size 103139

BIN
luasql-2.6.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

120
luasql-fix-configuration.patch
View File

@@ -1,3 +1,7 @@
---
config | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/config
+++ b/config
@@ -46,9 +46,8 @@ DRIVER_LIBS_firebird ?= -L/usr/local/fir
@@ -13,119 +17,3 @@
+DEFS = -std=gnu99 -fPIC
+CFLAGS=$(WARN) $(DRIVER_INCS) $(INCS) -DLUASQL_VERSION_NUMBER='"$V"' $(DEFS)
CC= gcc
--- a/src/ls_mysql.c
+++ b/src/ls_mysql.c
@@ -29,28 +29,28 @@
#define LUASQL_CURSOR_MYSQL "MySQL cursor"
/* For compat with old version 4.0 */
-#if (MYSQL_VERSION_ID < 40100)
-#define MYSQL_TYPE_VAR_STRING FIELD_TYPE_VAR_STRING
-#define MYSQL_TYPE_STRING FIELD_TYPE_STRING
-#define MYSQL_TYPE_DECIMAL FIELD_TYPE_DECIMAL
-#define MYSQL_TYPE_SHORT FIELD_TYPE_SHORT
-#define MYSQL_TYPE_LONG FIELD_TYPE_LONG
-#define MYSQL_TYPE_FLOAT FIELD_TYPE_FLOAT
-#define MYSQL_TYPE_DOUBLE FIELD_TYPE_DOUBLE
-#define MYSQL_TYPE_LONGLONG FIELD_TYPE_LONGLONG
-#define MYSQL_TYPE_INT24 FIELD_TYPE_INT24
-#define MYSQL_TYPE_YEAR FIELD_TYPE_YEAR
-#define MYSQL_TYPE_TINY FIELD_TYPE_TINY
-#define MYSQL_TYPE_TINY_BLOB FIELD_TYPE_TINY_BLOB
-#define MYSQL_TYPE_MEDIUM_BLOB FIELD_TYPE_MEDIUM_BLOB
-#define MYSQL_TYPE_LONG_BLOB FIELD_TYPE_LONG_BLOB
-#define MYSQL_TYPE_BLOB FIELD_TYPE_BLOB
-#define MYSQL_TYPE_DATE FIELD_TYPE_DATE
-#define MYSQL_TYPE_NEWDATE FIELD_TYPE_NEWDATE
-#define MYSQL_TYPE_DATETIME FIELD_TYPE_DATETIME
-#define MYSQL_TYPE_TIME FIELD_TYPE_TIME
-#define MYSQL_TYPE_TIMESTAMP FIELD_TYPE_TIMESTAMP
-#define MYSQL_TYPE_ENUM FIELD_TYPE_ENUM
+#if (MYSQL_VERSION_ID < 40100)
+#define MYSQL_TYPE_VAR_STRING FIELD_TYPE_VAR_STRING
+#define MYSQL_TYPE_STRING FIELD_TYPE_STRING
+#define MYSQL_TYPE_DECIMAL FIELD_TYPE_DECIMAL
+#define MYSQL_TYPE_SHORT FIELD_TYPE_SHORT
+#define MYSQL_TYPE_LONG FIELD_TYPE_LONG
+#define MYSQL_TYPE_FLOAT FIELD_TYPE_FLOAT
+#define MYSQL_TYPE_DOUBLE FIELD_TYPE_DOUBLE
+#define MYSQL_TYPE_LONGLONG FIELD_TYPE_LONGLONG
+#define MYSQL_TYPE_INT24 FIELD_TYPE_INT24
+#define MYSQL_TYPE_YEAR FIELD_TYPE_YEAR
+#define MYSQL_TYPE_TINY FIELD_TYPE_TINY
+#define MYSQL_TYPE_TINY_BLOB FIELD_TYPE_TINY_BLOB
+#define MYSQL_TYPE_MEDIUM_BLOB FIELD_TYPE_MEDIUM_BLOB
+#define MYSQL_TYPE_LONG_BLOB FIELD_TYPE_LONG_BLOB
+#define MYSQL_TYPE_BLOB FIELD_TYPE_BLOB
+#define MYSQL_TYPE_DATE FIELD_TYPE_DATE
+#define MYSQL_TYPE_NEWDATE FIELD_TYPE_NEWDATE
+#define MYSQL_TYPE_DATETIME FIELD_TYPE_DATETIME
+#define MYSQL_TYPE_TIME FIELD_TYPE_TIME
+#define MYSQL_TYPE_TIMESTAMP FIELD_TYPE_TIMESTAMP
+#define MYSQL_TYPE_ENUM FIELD_TYPE_ENUM
#define MYSQL_TYPE_SET FIELD_TYPE_SET
#define MYSQL_TYPE_NULL FIELD_TYPE_NULL
@@ -135,7 +135,7 @@ static char *getcolumntype (enum enum_fi
return "string";
case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_SHORT: case MYSQL_TYPE_LONG:
case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_LONGLONG:
- case MYSQL_TYPE_INT24: case MYSQL_TYPE_YEAR: case MYSQL_TYPE_TINY:
+ case MYSQL_TYPE_INT24: case MYSQL_TYPE_YEAR: case MYSQL_TYPE_TINY:
return "number";
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_BLOB:
@@ -193,7 +193,7 @@ static void cur_nullify (lua_State *L, c
luaL_unref (L, LUA_REGISTRYINDEX, cur->coltypes);
}
-
+
/*
** Get another row of the given cursor.
*/
@@ -225,7 +225,7 @@ static int cur_fetch (lua_State *L) {
if (cur->colnames == LUA_NOREF)
create_colinfo(L, cur);
lua_rawgeti (L, LUA_REGISTRYINDEX, cur->colnames);/* Push colnames*/
-
+
/* Copy values to alphanumerical indices */
for (i = 0; i < cur->numcols; i++) {
lua_rawgeti(L, -1, i+1); /* push the field name */
@@ -288,7 +288,7 @@ static void _pushtable (lua_State *L, cu
/* If colnames or coltypes do not exist, create both. */
if (*ref == LUA_NOREF)
create_colinfo(L, cur);
-
+
/* Pushes the right table (colnames or coltypes) */
lua_rawgeti (L, LUA_REGISTRYINDEX, *ref);
}
@@ -417,7 +417,7 @@ static int conn_execute (lua_State *L) {
conn_data *conn = getconnection (L);
size_t st_len;
const char *statement = luaL_checklstring (L, 2, &st_len);
- if (mysql_real_query(conn->my_conn, statement, st_len))
+ if (mysql_real_query(conn->my_conn, statement, st_len))
/* error executing query */
return luasql_failmsg(L, "error executing query. MySQL: ", mysql_error(conn->my_conn));
else
@@ -524,7 +524,7 @@ static int env_connect (lua_State *L) {
if (conn == NULL)
return luasql_faildirect(L, "error connecting: Out of memory.");
- if (!mysql_real_connect(conn, host, username, password,
+ if (!mysql_real_connect(conn, host, username, password,
sourcename, port, unix_socket, client_flag))
{
char error_msg[100];
@@ -618,7 +618,7 @@ static int create_environment (lua_State
** Creates the metatables for the objects and registers the
** driver open method.
*/
-LUASQL_API int luaopen_luasql_mysql (lua_State *L) {
+LUASQL_API int luaopen_luasql_mysql (lua_State *L) {
struct luaL_Reg driver[] = {
{"mysql", create_environment},
{NULL, NULL},