diff options
| author | rittneje <rittneje@gmail.com> | 2020-04-16 01:45:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 14:45:59 +0900 |
| commit | 98a44bcf5949f178c8116fa30e62c9ac2ef65927 (patch) | |
| tree | aa8ef6d0d26d93f3ee2e2e2231dc795492efe21b /_example | |
| parent | Add extension-functions.c info to README (#779) (diff) | |
| download | golite-98a44bcf5949f178c8116fa30e62c9ac2ef65927.tar.gz golite-98a44bcf5949f178c8116fa30e62c9ac2ef65927.tar.xz | |
report actual error message if sqlite3_load_extension fails (#800)
* report actual error message if sqlite3_load_extension fails
* more fixes and test cases
Co-authored-by: Jesse Rittner <jrittner@lutron.com>
Diffstat (limited to '_example')
| -rw-r--r-- | _example/mod_regexp/Makefile | 17 | ||||
| -rw-r--r-- | _example/mod_vtable/Makefile | 17 | ||||
| -rw-r--r-- | _example/mod_vtable/sqlite3_mod_vtable.cc | 2 |
3 files changed, 23 insertions, 13 deletions
diff --git a/_example/mod_regexp/Makefile b/_example/mod_regexp/Makefile index 97b1e0f..1ef69a6 100644 --- a/_example/mod_regexp/Makefile +++ b/_example/mod_regexp/Makefile @@ -1,22 +1,27 @@ ifeq ($(OS),Windows_NT) EXE=extension.exe -EXT=sqlite3_mod_regexp.dll +LIB_EXT=dll RM=cmd /c del LDFLAG= else EXE=extension -EXT=sqlite3_mod_regexp.so -RM=rm +ifeq ($(shell uname -s),Darwin) +LIB_EXT=dylib +else +LIB_EXT=so +endif +RM=rm -f LDFLAG=-fPIC endif +LIB=sqlite3_mod_regexp.$(LIB_EXT) -all : $(EXE) $(EXT) +all : $(EXE) $(LIB) $(EXE) : extension.go go build $< -$(EXT) : sqlite3_mod_regexp.c +$(LIB) : sqlite3_mod_regexp.c gcc $(LDFLAG) -shared -o $@ $< -lsqlite3 -lpcre clean : - @-$(RM) $(EXE) $(EXT) + @-$(RM) $(EXE) $(LIB) diff --git a/_example/mod_vtable/Makefile b/_example/mod_vtable/Makefile index cdd4853..f65a004 100644 --- a/_example/mod_vtable/Makefile +++ b/_example/mod_vtable/Makefile @@ -1,24 +1,29 @@ ifeq ($(OS),Windows_NT) EXE=extension.exe -EXT=sqlite3_mod_vtable.dll +LIB_EXT=dll RM=cmd /c del LIBCURL=-lcurldll LDFLAG= else EXE=extension -EXT=sqlite3_mod_vtable.so -RM=rm +ifeq ($(shell uname -s),Darwin) +LIB_EXT=dylib +else +LIB_EXT=so +endif +RM=rm -f LDFLAG=-fPIC LIBCURL=-lcurl endif +LIB=sqlite3_mod_vtable.$(LIB_EXT) -all : $(EXE) $(EXT) +all : $(EXE) $(LIB) $(EXE) : extension.go go build $< -$(EXT) : sqlite3_mod_vtable.cc +$(LIB) : sqlite3_mod_vtable.cc g++ $(LDFLAG) -shared -o $@ $< -lsqlite3 $(LIBCURL) clean : - @-$(RM) $(EXE) $(EXT) + @-$(RM) $(EXE) $(LIB) diff --git a/_example/mod_vtable/sqlite3_mod_vtable.cc b/_example/mod_vtable/sqlite3_mod_vtable.cc index 5bd4e66..4caf484 100644 --- a/_example/mod_vtable/sqlite3_mod_vtable.cc +++ b/_example/mod_vtable/sqlite3_mod_vtable.cc @@ -1,6 +1,6 @@ #include <string> #include <sstream> -#include <sqlite3-binding.h> +#include <sqlite3.h> #include <sqlite3ext.h> #include <curl/curl.h> #include "picojson.h" |