Add Sqlite_str module

Implements the REGEX SQL operator using OCaml's Str module for regexps.

Author: oandrieu

Makefile

@@ -1,10 +1,15 @@
 include config.make
 
+SRC_ML = sqlite3.ml sqlite3_big.ml sqlite3_str.ml
+SRC_C  = ocaml-sqlite3.c ocaml-sqlite3-big.c
+
+OBJ = $(SRC_ML:%.ml=%.cmo) $(SRC_ML:%.ml=%.cmx) $(SRC_C:%.c=%.o)
+
 CPPFLAGS += $(SQLITE_CFLAGS)
 
 lib : sqlite3.cma
 
-sqlite3.cma : sqlite3.cmo sqlite3.cmx sqlite3_big.cmo sqlite3_big.cmx ocaml-sqlite3.o ocaml-sqlite3-big.o
+sqlite3.cma : $(OBJ)
 ifeq ($(STATIC), yes)
 	$(OCAMLMKLIB) -v -custom -o sqlite3 -oc mlsqlite3 -cclib "$(SQLITE_LIBS)" $^
 else
@@ -16,6 +21,9 @@ sqlite3.cmx : sqlite3.cmi
 sqlite3_big.cmo : sqlite3_big.cmi
 sqlite3_big.cmx : sqlite3_big.cmi
 sqlite3_big.cmi : sqlite3.cmi
+sqlite3_str.cmo : sqlite3_str.cmi
+sqlite3_str.cmx : sqlite3_str.cmi
+sqlite3_str.cmi : sqlite3.cmi
 
 ocaml-sqlite3.o     : ocaml-sqlite3.h
 ocaml-sqlite3-big.o : ocaml-sqlite3.h
@@ -32,8 +40,8 @@ ocaml-sqlite3-big.o : ocaml-sqlite3.h
 META : META.in
 	sed 's/@VERSION@/$(VERSION)/' $< > $@
 
-INSTALL_FILES = META sqlite3.{cmi,mli,cmx} sqlite3_big.{cmi,mli,cmx} sqlite3.{cma,cmxa,a} libmlsqlite3.a $(if $(STATIC),,dllmlsqlite3.so)
-DIST_FILES    = README META META.in Makefile ocaml-sqlite3.c ocaml-sqlite3-big.c ocaml-sqlite3.h sqlite3.ml sqlite3.mli sqlite3_big.ml sqlite3_big.mli configure configure.ac acinclude.m4 aclocal.m4 config.h.in config.make.in doc
+INSTALL_FILES = META sqlite3{,_big,_str}.{cmi,mli,cmx} sqlite3.{cma,cmxa,a} ocaml-sqlite3.h libmlsqlite3.a $(if $(STATIC),,dllmlsqlite3.so)
+DIST_FILES    = README META META.in Makefile ocaml-sqlite3.h $(SRC_C) $(SRC_ML) $(SRC_ML:%.ml=%.mli) configure configure.ac acinclude.m4 aclocal.m4 config.h.in config.make.in doc
 
 dist : ../$(TARNAME)-$(VERSION).tar.gz
 ../$(TARNAME)-$(VERSION).tar.gz : $(DIST_FILES)
@@ -43,9 +51,9 @@ dist : ../$(TARNAME)-$(VERSION).tar.gz
 	tar zcvf $(TARNAME)-$(VERSION).tar.gz $(addprefix $(TARNAME)-$(VERSION)/,$(DIST_FILES)) ; \
 	mv $(TARNAME)-$(VERSION) $$dir
 
-doc : sqlite3_big.cmi sqlite3.cmi
+doc : sqlite3.cmi sqlite3_big.cmi sqlite3_str.cmi
 	mkdir -p doc
-	ocamldoc -v -html -d doc -t "$(NAME) $(VERSION)" sqlite3.mli sqlite3_big.mli
+	ocamldoc -v -html -d doc -t "$(NAME) $(VERSION)" sqlite3.mli sqlite3_big.mli sqlite_str.mli
 
 install : lib META
 	$(OCAMLFIND) install $(TARNAME) $(INSTALL_FILES)

sqlite3_str.ml

@@ -0,0 +1,16 @@
+
+let sql_value_of_bool b =
+  if b then `INT 1 else `INT 0
+
+let sqlite_regexp arg_p arg_t =
+  let p = Sqlite3.value_text arg_p in
+  let t = Sqlite3.value_text arg_t in
+  sql_value_of_bool
+    (Str.string_match 
+       (Str.regexp p) t 0)
+
+let register db =
+  Sqlite3.create_fun_2 db "regexp" sqlite_regexp
+
+let unregister db =
+  Sqlite3.delete_function db "regexp"

sqlite3_str.mli

@@ -0,0 +1,4 @@
+(** Implement the [REGEXP] SQL operator using OCaml [Str] module *)
+
+val register   : Sqlite3.db -> unit
+val unregister : Sqlite3.db -> unit