Improved handling of -safe-string option

Author: mmottl

CHANGES.txt

@@ -1,3 +1,6 @@
+2014-10-23:  Fixed string handling for new OCaml version 4.02 (String/Bytes
+             modules).  Requires new findlib version (>= 1.5).
+
 2014-08-14:  Even more new asynchronous methods:
 
                * optional [startonly] flag for creating an asynchronous connection

INSTALL.txt

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: c9cde8d1d7a6bc1ed6236ec912d83768) *)
+(* DO NOT EDIT (digest: e89ae2ea2704a024c7441389a203faa8) *)
 
 This is the INSTALL file for the postgresql-ocaml distribution.
 
@@ -12,7 +12,8 @@ Dependencies
 In order to compile this package, you will need:
 
 * ocaml (>= 3.12) for all, doc API
-* findlib (>= 1.3.1)
+* findlib (>= 1.5)
+* bytes for library postgresql
 * lablgtk2 for executable prompt_gtk
 
 Installing

_oasis

@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             postgresql-ocaml
-Version:          2.1.0
+Version:          2.1.1
 Synopsis:         postgresql-ocaml - bindings to the PostgreSQL library
 Description:      postgresql-ocaml offers library functions for accessing PostgreSQL databases
 Authors:          Alain Frisch <[email protected]>,
@@ -14,7 +14,7 @@ Maintainers:      Markus Mottl <[email protected]>,
 LicenseFile:      COPYING.txt
 License:          LGPL-2.1+ with OCaml linking exception
 OCamlVersion:     >= 3.12
-FindlibVersion:   >= 1.3.1
+FindlibVersion:   >= 1.5
 Homepage:         http://mmottl.github.io/postgresql-ocaml
 #Categories:
 #FilesAB:
@@ -37,7 +37,7 @@ Library postgresql
   if flag(strict) && ccomp_type(cc)
     CCOpt+:       -Wall -pedantic -Wextra -Wunused -Wno-long-long
   CCLib:          -lpq
-  BuildDepends:   threads, bigarray
+  BuildDepends:   threads, bigarray, bytes
 
 
 # Examples

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: d32380a8a5d9af5342a2f383d8fb4575)
+# DO NOT EDIT (digest: 843c6fb516c1ba86d98cfc39f6e78629)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -24,40 +24,50 @@
 "lib/dllpostgresql_stubs.so": oasis_library_postgresql_cclib
 <lib/postgresql.{cma,cmxa}>: use_libpostgresql_stubs
 <lib/*.ml{,i}>: pkg_bigarray
+<lib/*.ml{,i}>: pkg_bytes
 <lib/*.ml{,i}>: pkg_threads
 "lib/postgresql_stubs.c": pkg_bigarray
+"lib/postgresql_stubs.c": pkg_bytes
 "lib/postgresql_stubs.c": pkg_threads
 # Executable async
 <examples/async.{native,byte}>: pkg_bigarray
+<examples/async.{native,byte}>: pkg_bytes
 <examples/async.{native,byte}>: pkg_threads
 <examples/async.{native,byte}>: use_postgresql
 # Executable cursor
 <examples/cursor.{native,byte}>: pkg_bigarray
+<examples/cursor.{native,byte}>: pkg_bytes
 <examples/cursor.{native,byte}>: pkg_threads
 <examples/cursor.{native,byte}>: use_postgresql
 # Executable dump
 <examples/dump.{native,byte}>: pkg_bigarray
+<examples/dump.{native,byte}>: pkg_bytes
 <examples/dump.{native,byte}>: pkg_threads
 <examples/dump.{native,byte}>: use_postgresql
 # Executable populate
 <examples/populate.{native,byte}>: pkg_bigarray
+<examples/populate.{native,byte}>: pkg_bytes
 <examples/populate.{native,byte}>: pkg_threads
 <examples/populate.{native,byte}>: use_postgresql
 # Executable prompt
 <examples/prompt.{native,byte}>: pkg_bigarray
+<examples/prompt.{native,byte}>: pkg_bytes
 <examples/prompt.{native,byte}>: pkg_threads
 <examples/prompt.{native,byte}>: use_postgresql
 # Executable prompt_gtk
 <examples/prompt_gtk.{native,byte}>: pkg_bigarray
+<examples/prompt_gtk.{native,byte}>: pkg_bytes
 <examples/prompt_gtk.{native,byte}>: pkg_lablgtk2
 <examples/prompt_gtk.{native,byte}>: pkg_threads
 <examples/prompt_gtk.{native,byte}>: use_postgresql
 <examples/*.ml{,i}>: pkg_lablgtk2
 # Executable test_lo
 <examples/test_lo.{native,byte}>: pkg_bigarray
+<examples/test_lo.{native,byte}>: pkg_bytes
 <examples/test_lo.{native,byte}>: pkg_threads
 <examples/test_lo.{native,byte}>: use_postgresql
 <examples/*.ml{,i}>: pkg_bigarray
+<examples/*.ml{,i}>: pkg_bytes
 <examples/*.ml{,i}>: pkg_threads
 <examples/*.ml{,i}>: use_postgresql
 # OASIS_STOP

lib/META

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 89a9f5cb543b3603a4c9a0212e24c63f)
-version = "2.1.0"
+# DO NOT EDIT (digest: 96ce45a2fe6b0b524fc6731126b5f129)
+version = "2.1.1"
 description = "postgresql-ocaml - bindings to the PostgreSQL library"
-requires = "threads bigarray"
+requires = "threads bigarray bytes"
 archive(byte) = "postgresql.cma"
 archive(byte, plugin) = "postgresql.cma"
 archive(native) = "postgresql.cmxa"

lib/postgresql.mli

@@ -24,8 +24,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-open Postgresql_compat
-
 (** Client-interface to the PostgreSQL database. *)
 
 (** Please learn about more details in the database documentation! *)

lib/postgresql_compat.ml

@@ -1,3 +1 @@
-module Bytes = Bytes
-
 let buffer_add_subbytes = Buffer.add_subbytes

lib/postgresql_compat312.ml

@@ -1,3 +1 @@
-module Bytes = String
-
 let buffer_add_subbytes = Buffer.add_substring

lib/postgresql_compat402.ml

@@ -1,3 +1 @@
-module Bytes = Bytes
-
 let buffer_add_subbytes = Buffer.add_subbytes

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5a2c9fbb351fb3cffecc7b7cc1be5a8f) *)
+(* DO NOT EDIT (digest: 067e12b9c3da0df8c7a27c34a0b12394) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6644,11 +6644,11 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = Some (OASISVersion.VGreaterEqual "3.12");
-          findlib_version = Some (OASISVersion.VGreaterEqual "1.3.1");
+          findlib_version = Some (OASISVersion.VGreaterEqual "1.5");
           alpha_features = [];
           beta_features = [];
           name = "postgresql-ocaml";
-          version = "2.1.0";
+          version = "2.1.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6744,7 +6744,8 @@ let setup_t =
                       bs_build_depends =
                         [
                            FindlibPackage ("threads", None);
-                           FindlibPackage ("bigarray", None)
+                           FindlibPackage ("bigarray", None);
+                           FindlibPackage ("bytes", None)
                         ];
                       bs_build_tools =
                         [ExternalTool "ocamldoc"; ExternalTool "ocamlbuild"];
@@ -7065,15 +7066,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "£\1508ý9ã;Í»þ\031?~\012\007\146";
+     oasis_digest = Some "\001áT£e«\148\"ýØKóH¶uv";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7077 "setup.ml"
+# 7078 "setup.ml"
 (* OASIS_STOP *)
 
 let () =