Refactoring, renamed module. Added wrapper routine.

Author: interkosmos

Makefile

@@ -11,20 +11,20 @@ LDFLAGS = -I$(PREFIX)/include/ -L$(PREFIX)/lib/
 LDLIBS  = -lsqlite3
 ARFLAGS = rcs
 TARGET  = libfortran-sqlite3.a
-TEST    = test_sqlite
+TEST    = test_sqlite3
 
 .PHONY: all clean test
 
 all: $(TARGET)
 test: $(TEST)
 
 $(TARGET):
-	$(FC) $(FFLAGS) -c src/sqlite_util.f90
-	$(FC) $(FFLAGS) -c src/sqlite.f90
-	$(AR) $(ARFLAGS) $(TARGET) sqlite_util.o sqlite.o
+	$(FC) $(FFLAGS) -c src/sqlite3_util.f90
+	$(FC) $(FFLAGS) -c src/sqlite3.f90
+	$(AR) $(ARFLAGS) $(TARGET) sqlite3_util.o sqlite3.o
 
 $(TEST): $(TARGET)
-	$(FC) $(FFLAGS) $(LDFLAGS) -o test_sqlite test/test_sqlite.f90 $(TARGET) $(LDLIBS)
+	$(FC) $(FFLAGS) $(LDFLAGS) -o test_sqlite3 test/test_sqlite3.f90 $(TARGET) $(LDLIBS)
 
 clean:
 	if [ `ls -1 *.mod 2>/dev/null | wc -l` -gt 0 ]; then rm *.mod; fi

README.md

@@ -64,8 +64,8 @@ convert C char pointer to Fortran allocatable character.
 ! example.f90
 program example
     use, intrinsic :: iso_c_binding
-    use :: sqlite
-    use :: sqlite_util
+    use :: sqlite3
+    use :: sqlite3_util
     implicit none (type, external)
     character(len=:), allocatable :: errmsg
     integer                       :: rc

fpm.toml

@@ -1,11 +1,11 @@
 name = "fortran-sqlite3"
-version = "0.1.0"
+version = "0.2.0"
 license = "ISC"
 author = "Philipp Engel"
 maintainer = "@interkosmos"
-copyright = "Copyright (c) 2021, Philipp Engel"
+copyright = "Copyright (c) 2022, Philipp Engel"
 description = "Fortran 2018 ISO C binding interfaces to SQLite 3"
-keywords = ["sqlite"]
+keywords = [ "sqlite", "sqlite3" ]
 
 [build]
 link = "sqlite3"
@@ -14,6 +14,6 @@ link = "sqlite3"
 source-dir = "src"
 
 [[test]]
-name = "test_sqlite"
+name = "test_sqlite3"
 source-dir = "test"
-main = "test_sqlite.f90"
+main = "test_sqlite3.f90"

src/sqlite.f90 renamed to src/sqlite3.f90

@@ -1,13 +1,13 @@
-! sqlite.f90
+! sqlite3.f90
 !
 ! Fortran 2018 interface bindings to SQLite 3.
 !
 ! Author:  Philipp Engel
 ! Licence: ISC
-module sqlite
+module sqlite3
     use, intrinsic :: iso_c_binding
     use, intrinsic :: iso_fortran_env, only: i8 => int64
-    use :: sqlite_util
+    use :: sqlite3_util
     implicit none (type, external)
     private
 
@@ -186,6 +186,7 @@ module sqlite
     public :: sqlite3_libversion_
     public :: sqlite3_libversion_number
     public :: sqlite3_log
+    public :: sqlite3_log_
     public :: sqlite3_open
     public :: sqlite3_open_
     public :: sqlite3_prepare
@@ -498,10 +499,10 @@ function sqlite3_libversion_number() bind(c, name='sqlite3_libversion_number')
         end function sqlite3_libversion_number
 
         ! int sqlite3_open(const char *filename, sqlite3 **db)
-        function sqlite3_open_(filename, db) bind(c, name='sqlite3_open')
+        function sqlite3_open_(file_name, db) bind(c, name='sqlite3_open')
             import :: c_char, c_int, c_ptr
             implicit none
-            character(kind=c_char), intent(in)    :: filename
+            character(kind=c_char), intent(in)    :: file_name
             type(c_ptr),            intent(inout) :: db
             integer(kind=c_int)                   :: sqlite3_open_
         end function sqlite3_open_
@@ -660,12 +661,12 @@ subroutine sqlite3_free(ptr) bind(c, name='sqlite3_free')
         end subroutine sqlite3_free
 
         ! void sqlite3_log(int iErrCode, const char *zFormat, ...)
-        subroutine sqlite3_log(ierr_code, zformat) bind(c, name='sqlite3_log')
+        subroutine sqlite3_log_(ierr_code, zformat) bind(c, name='sqlite3_log')
             import :: c_char, c_int
             implicit none
             integer(kind=c_int),    intent(in), value :: ierr_code
             character(kind=c_char), intent(in)        :: zformat
-        end subroutine sqlite3_log
+        end subroutine sqlite3_log_
 
         ! void sqlite3_str_append(sqlite3_str *str, const char *zIn, int N)
         subroutine sqlite3_str_append(str, zin, n) bind(c, name='slqite3_str_append')
@@ -830,12 +831,12 @@ function sqlite3_libversion()
         call c_f_str_ptr(ptr, sqlite3_libversion)
     end function sqlite3_libversion
 
-    function sqlite3_open(filename, db)
-        character(len=*), intent(in)  :: filename
+    function sqlite3_open(file_name, db)
+        character(len=*), intent(in)  :: file_name
         type(c_ptr),      intent(out) :: db
         integer                       :: sqlite3_open
 
-        sqlite3_open = sqlite3_open_(filename // c_null_char, db)
+        sqlite3_open = sqlite3_open_(file_name // c_null_char, db)
     end function sqlite3_open
 
     function sqlite3_prepare(db, sql, stmt)
@@ -874,4 +875,11 @@ function sqlite3_str_value(str)
         if (.not. c_associated(ptr)) return
         call c_f_str_ptr(ptr, sqlite3_str_value)
     end function sqlite3_str_value
-end module sqlite
+
+    subroutine sqlite3_log(ierr_code, zformat)
+        integer,          intent(in) :: ierr_code
+        character(len=*), intent(in) :: zformat
+
+        call sqlite3_log_(ierr_code, zformat // c_null_char)
+    end subroutine sqlite3_log
+end module sqlite3

src/sqlite_util.f90 renamed to src/sqlite3_util.f90

@@ -1,10 +1,10 @@
-! sqlite_util.f90
+! sqlite3_util.f90
 !
 ! C interoperability interfaces and procedures.
 !
 ! Author:  Philipp Engel
 ! Licence: ISC
-module sqlite_util
+module sqlite3_util
     use, intrinsic :: iso_c_binding
     use, intrinsic :: iso_fortran_env, only: i8 => int64, r8 => real64
     implicit none (type, external)
@@ -47,4 +47,4 @@ subroutine c_f_str_ptr(c_str, f_str)
         allocate (character(len=sz) :: f_str)
         f_str = copy(ptrs)
     end subroutine c_f_str_ptr
-end module sqlite_util
+end module sqlite3_util

test/test_sqlite.f90 renamed to test/test_sqlite3.f90

@@ -1,8 +1,8 @@
-! test_sqlite.f90
+! test_sqlite3.f90
 module callbacks
     use, intrinsic :: iso_c_binding
-    use :: sqlite
-    use :: sqlite_util
+    use :: sqlite3
+    use :: sqlite3_util
     implicit none
     private
 
@@ -79,14 +79,14 @@ subroutine update_callback(udp, type, db_name, tbl_name, rowid) bind(c)
                     rowid, tbl_str, db_str
         end select
 
-        if (allocated(db_str)) deallocate(db_str)
-        if (allocated(db_str)) deallocate(tbl_str)
+        if (allocated(db_str)) deallocate (db_str)
+        if (allocated(db_str)) deallocate (tbl_str)
     end subroutine update_callback
 end module callbacks
 
-program test_sqlite
+program test_sqlite3
     use, intrinsic :: iso_c_binding
-    use :: sqlite
+    use :: sqlite3
     use :: callbacks
     implicit none (type, external)
     character(len=*), parameter :: DB_FILE  = 'test.db'
@@ -118,7 +118,7 @@ program test_sqlite
     print '("DB name: ", a)', db_name
 
     ! Testing logging.
-    call sqlite3_log(1, 'TEST LOG' // c_null_char)
+    call sqlite3_log(1, 'TEST LOG')
 
     ! Enable WAL mode.
     print '("Turning WAL mode on ...")'
@@ -236,12 +236,19 @@ integer function journal_mode_wal(db) result(rc)
     end function journal_mode_wal
 
     subroutine print_error(rc, func, errmsg)
-      integer,                       intent(in)    :: rc
-      character(len=*),              intent(in)    :: func
-      character(len=:), allocatable, intent(inout) :: errmsg
+        integer,                       intent(in)    :: rc
+        character(len=*),              intent(in)    :: func
+        character(len=:), allocatable, intent(inout) :: errmsg
 
-      if (rc /= SQLITE_OK) print '(a, "(): ", a)', trim(func), errmsg
-      if (allocated(errmsg)) deallocate(errmsg)
+        if (rc == SQLITE_OK) return
+
+        if (allocated(errmsg)) then
+            print '(a, "(): ", a)', trim(func), errmsg
+            deallocate (errmsg)
+            return
+        end if
+
+        print '(a, "(): unknown error")', trim(func)
     end subroutine print_error
 
     subroutine print_values(stmt, ncols)
@@ -265,7 +272,7 @@ subroutine print_values(stmt, ncols)
                     buf = sqlite3_column_text(stmt, i)
                     if (allocated(buf)) then
                         write (*, '(a12)', advance='no') buf
-                        deallocate(buf)
+                        deallocate (buf)
                     end if
 
                 case default
@@ -275,4 +282,4 @@ subroutine print_values(stmt, ncols)
 
         print *
     end subroutine print_values
-end program test_sqlite
+end program test_sqlite3