[GRASS-dev] [GRASS-SVN] r66772 - in grass/trunk: db/drivers db/drivers/dbf db/drivers/mysql db/drivers/odbc db/drivers/ogr db/drivers/postgres db/drivers/sqlite lib/db/dbmi_driver lib/db/stubs
Martin Landa
landa.martin at gmail.com
Wed Nov 11 07:52:47 PST 2015
Hi,
2015-11-09 12:47 GMT+01:00 <svn_grass at osgeo.org>:
> Author: glynn
> Date: 2015-11-09 03:47:38 -0800 (Mon, 09 Nov 2015)
> New Revision: 66772
fyi, it seems that it broke travis builds [1]. Ma
add_col.c:2:27: fatal error: grass/dbstubs.h: No such file or directory
compilation terminated.
[1] https://s3.amazonaws.com/archive.travis-ci.org/jobs/90543352/log.txt
> --- grass/trunk/db/drivers/dbf/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/dbf/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,22 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_create_table();
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_list_tables();
> -int db__driver_open_select_cursor();
> -
> #define init_dbdriver() do{\
> db_driver_create_table = db__driver_create_table;\
> db_driver_close_cursor = db__driver_close_cursor;\
>
> Deleted: grass/trunk/db/drivers/mk_dbdriver_h.sh
> ===================================================================
> --- grass/trunk/db/drivers/mk_dbdriver_h.sh 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/mk_dbdriver_h.sh 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,31 +0,0 @@
> -#!/bin/sh
> -# generates dbdriver.h
> -
> -tmp=mk_dbdriver_h.tmp.$$
> -cat <<'EOT'> dbdriver.h
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> -#ifndef DBDRIVER_H
> -#define DBDRIVER_H
> -
> -#include <grass/dbstubs.h>
> -
> -EOT
> -
> -grep -h '^\( *int *\)\?db__driver' *.c | sed \
> - -e 's/^\( *int *\)*/int /' \
> - -e 's/ *(.*$/();/' > $tmp
> -cat $tmp >> dbdriver.h
> -
> -cat <<'EOT' >> dbdriver.h
> -
> -#define init_dbdriver() do{\
> -EOT
> -
> -sed 's/^int *db__\([a-zA-Z_]*\).*$/db_\1 = db__\1;\\/' $tmp >> dbdriver.h
> -cat <<'EOT'>> dbdriver.h
> -}while(0)
> -
> -#endif
> -EOT
> -
> -rm $tmp
>
> Modified: grass/trunk/db/drivers/mysql/dbdriver.h
> ===================================================================
> --- grass/trunk/db/drivers/mysql/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/mysql/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,25 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_create_table();
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_begin_transaction();
> -int db__driver_commit_transaction();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_create_index();
> -int db__driver_list_tables();
> -int db__driver_open_select_cursor();
> -
> #define init_dbdriver() do{\
> db_driver_create_table = db__driver_create_table;\
> db_driver_close_cursor = db__driver_close_cursor;\
>
> Modified: grass/trunk/db/drivers/odbc/dbdriver.h
> ===================================================================
> --- grass/trunk/db/drivers/odbc/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/odbc/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,24 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_create_table();
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_list_databases();
> -int db__driver_list_tables();
> -int db__driver_open_select_cursor();
> -int db__driver_drop_table();
> -
> #define init_dbdriver() do{\
> db_driver_create_table = db__driver_create_table;\
> db_driver_close_cursor = db__driver_close_cursor;\
>
> Modified: grass/trunk/db/drivers/ogr/dbdriver.h
> ===================================================================
> --- grass/trunk/db/drivers/ogr/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/ogr/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,21 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_list_tables();
> -int db__driver_open_select_cursor();
> -
> #define init_dbdriver() do{\
> db_driver_close_cursor = db__driver_close_cursor;\
> db_driver_open_database = db__driver_open_database;\
>
> Modified: grass/trunk/db/drivers/postgres/dbdriver.h
> ===================================================================
> --- grass/trunk/db/drivers/postgres/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/postgres/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,30 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_create_table();
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_create_database();
> -int db__driver_delete_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_begin_transaction();
> -int db__driver_commit_transaction();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_create_index();
> -int db__driver_list_databases();
> -int db__driver_list_tables();
> -int db__driver_grant_on_table();
> -int db__driver_open_select_cursor();
> -int db__driver_drop_table();
> -
> #define init_dbdriver() do{\
> db_driver_create_table = db__driver_create_table;\
> db_driver_close_cursor = db__driver_close_cursor;\
>
> Modified: grass/trunk/db/drivers/sqlite/dbdriver.h
> ===================================================================
> --- grass/trunk/db/drivers/sqlite/dbdriver.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/db/drivers/sqlite/dbdriver.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,29 +1,8 @@
> -/* this file was automatically generated by ../mk_dbdriver_h.sh */
> #ifndef DBDRIVER_H
> #define DBDRIVER_H
>
> #include <grass/dbstubs.h>
>
> -int db__driver_create_table();
> -int db__driver_close_cursor();
> -int db__driver_open_database();
> -int db__driver_close_database();
> -int db__driver_create_database();
> -int db__driver_delete_database();
> -int db__driver_describe_table();
> -int db__driver_init();
> -int db__driver_finish();
> -int db__driver_execute_immediate();
> -int db__driver_begin_transaction();
> -int db__driver_commit_transaction();
> -int db__driver_fetch();
> -int db__driver_get_num_rows();
> -int db__driver_create_index();
> -int db__driver_list_databases();
> -int db__driver_list_tables();
> -int db__driver_open_select_cursor();
> -int db__driver_drop_table();
> -
> #define init_dbdriver() do{\
> db_driver_create_table = db__driver_create_table;\
> db_driver_close_cursor = db__driver_close_cursor;\
>
> Modified: grass/trunk/lib/db/dbmi_driver/dbstubs.h
> ===================================================================
> --- grass/trunk/lib/db/dbmi_driver/dbstubs.h 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/lib/db/dbmi_driver/dbstubs.h 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,102 +1,102 @@
> -/* this file was automatically generated by mk_dbstubs_h.sh */
> #ifndef DBSTUBS_H
> #define DBSTUBS_H
>
> +extern int db__driver_add_column(dbString *, dbColumn *);
> +extern int db__driver_bind_update(dbCursor *);
> +extern int db__driver_close_cursor(dbCursor *);
> +extern int db__driver_close_database(void);
> +extern int db__driver_create_index(dbIndex *);
> +extern int db__driver_create_table(dbTable *);
> +extern int db__driver_create_database(dbHandle *);
> +extern int db__driver_delete(dbCursor *);
> +extern int db__driver_delete_database(dbHandle *);
> +extern int db__driver_describe_table(dbString *, dbTable **);
> +extern int db__driver_drop_column(dbString *, dbString *);
> +extern int db__driver_drop_index(dbString *);
> +extern int db__driver_drop_table(dbString *);
> +extern int db__driver_execute_immediate(dbString *);
> +extern int db__driver_fetch(dbCursor *, int, int *);
> +extern int db__driver_find_database(dbHandle *, int *);
> +extern int db__driver_finish(void);
> +extern int db__driver_init(int, char **);
> +extern int db__driver_insert(dbCursor *);
> +extern int db__driver_list_indexes(dbString *, dbIndex **, int *);
> +extern int db__driver_list_tables(dbString **, int *, int);
> +extern int db__driver_list_databases(dbString *, int, dbHandle **, int *);
> +extern int db__driver_open_insert_cursor(dbCursor *);
> +extern int db__driver_open_select_cursor(dbString *, dbCursor *, int);
> +extern int db__driver_open_update_cursor(dbString *, dbString *, dbCursor *, int);
> +extern int db__driver_open_database(dbHandle *);
> +extern int db__driver_grant_on_table(dbString *, int, int);
> +extern int db__driver_get_num_rows(dbCursor *);
> +extern int db__driver_begin_transaction(void);
> +extern int db__driver_commit_transaction(void);
> +extern int db__driver_update(dbCursor *);
> +
> #ifdef DB_DRIVER_C
> -extern int db__driver_add_column();
> -extern int db__driver_bind_update();
> -extern int db__driver_close_cursor();
> -extern int db__driver_close_database();
> -extern int db__driver_create_index();
> -extern int db__driver_create_table();
> -extern int db__driver_create_database();
> -extern int db__driver_delete();
> -extern int db__driver_delete_database();
> -extern int db__driver_describe_table();
> -extern int db__driver_drop_column();
> -extern int db__driver_drop_index();
> -extern int db__driver_drop_table();
> -extern int db__driver_execute_immediate();
> -extern int db__driver_fetch();
> -extern int db__driver_find_database();
> -extern int db__driver_finish();
> -extern int db__driver_init();
> -extern int db__driver_insert();
> -extern int db__driver_list_indexes();
> -extern int db__driver_list_tables();
> -extern int db__driver_list_databases();
> -extern int db__driver_open_insert_cursor();
> -extern int db__driver_open_select_cursor();
> -extern int db__driver_open_update_cursor();
> -extern int db__driver_open_database();
> -extern int db__driver_grant_on_table();
> -extern int db__driver_get_num_rows();
> -extern int db__driver_begin_transaction();
> -extern int db__driver_commit_transaction();
> -extern int db__driver_update();
> -int (*db_driver_add_column) () = db__driver_add_column;
> -int (*db_driver_bind_update) () = db__driver_bind_update;
> -int (*db_driver_close_cursor) () = db__driver_close_cursor;
> -int (*db_driver_close_database) () = db__driver_close_database;
> -int (*db_driver_create_index) () = db__driver_create_index;
> -int (*db_driver_create_table) () = db__driver_create_table;
> -int (*db_driver_create_database) () = db__driver_create_database;
> -int (*db_driver_delete) () = db__driver_delete;
> -int (*db_driver_delete_database) () = db__driver_delete_database;
> -int (*db_driver_describe_table) () = db__driver_describe_table;
> -int (*db_driver_drop_column) () = db__driver_drop_column;
> -int (*db_driver_drop_index) () = db__driver_drop_index;
> -int (*db_driver_drop_table) () = db__driver_drop_table;
> -int (*db_driver_execute_immediate) () = db__driver_execute_immediate;
> -int (*db_driver_fetch) () = db__driver_fetch;
> -int (*db_driver_find_database) () = db__driver_find_database;
> -int (*db_driver_finish) () = db__driver_finish;
> -int (*db_driver_init) () = db__driver_init;
> -int (*db_driver_insert) () = db__driver_insert;
> -int (*db_driver_list_indexes) () = db__driver_list_indexes;
> -int (*db_driver_list_tables) () = db__driver_list_tables;
> -int (*db_driver_list_databases) () = db__driver_list_databases;
> -int (*db_driver_open_insert_cursor) () = db__driver_open_insert_cursor;
> -int (*db_driver_open_select_cursor) () = db__driver_open_select_cursor;
> -int (*db_driver_open_update_cursor) () = db__driver_open_update_cursor;
> -int (*db_driver_open_database) () = db__driver_open_database;
> -int (*db_driver_grant_on_table) () = db__driver_grant_on_table;
> -int (*db_driver_get_num_rows) () = db__driver_get_num_rows;
> -int (*db_driver_begin_transaction) () = db__driver_begin_transaction;
> -int (*db_driver_commit_transaction) () = db__driver_commit_transaction;
> -int (*db_driver_update) () = db__driver_update;
> +int (*db_driver_add_column) (dbString *, dbColumn *) = db__driver_add_column;
> +int (*db_driver_bind_update) (dbCursor *) = db__driver_bind_update;
> +int (*db_driver_close_cursor) (dbCursor *) = db__driver_close_cursor;
> +int (*db_driver_close_database) (void) = db__driver_close_database;
> +int (*db_driver_create_index) (dbIndex *) = db__driver_create_index;
> +int (*db_driver_create_table) (dbTable *) = db__driver_create_table;
> +int (*db_driver_create_database) (dbHandle *) = db__driver_create_database;
> +int (*db_driver_delete) (dbCursor *) = db__driver_delete;
> +int (*db_driver_delete_database) (dbHandle *) = db__driver_delete_database;
> +int (*db_driver_describe_table) (dbString *, dbTable **) = db__driver_describe_table;
> +int (*db_driver_drop_column) (dbString *, dbString *) = db__driver_drop_column;
> +int (*db_driver_drop_index) (dbString *) = db__driver_drop_index;
> +int (*db_driver_drop_table) (dbString *) = db__driver_drop_table;
> +int (*db_driver_execute_immediate) (dbString *) = db__driver_execute_immediate;
> +int (*db_driver_fetch) (dbCursor *, int, int *) = db__driver_fetch;
> +int (*db_driver_find_database) (dbHandle *, int *) = db__driver_find_database;
> +int (*db_driver_finish) (void) = db__driver_finish;
> +int (*db_driver_init) (int, char **) = db__driver_init;
> +int (*db_driver_insert) (dbCursor *) = db__driver_insert;
> +int (*db_driver_list_indexes) (dbString *, dbIndex **, int *) = db__driver_list_indexes;
> +int (*db_driver_list_tables) (dbString **, int *, int) = db__driver_list_tables;
> +int (*db_driver_list_databases) (dbString *, int, dbHandle **, int *) = db__driver_list_databases;
> +int (*db_driver_open_insert_cursor) (dbCursor *) = db__driver_open_insert_cursor;
> +int (*db_driver_open_select_cursor) (dbString *, dbCursor *, int) = db__driver_open_select_cursor;
> +int (*db_driver_open_update_cursor) (dbString *, dbString *, dbCursor *, int) = db__driver_open_update_cursor;
> +int (*db_driver_open_database) (dbHandle *) = db__driver_open_database;
> +int (*db_driver_grant_on_table) (dbString *, int, int) = db__driver_grant_on_table;
> +int (*db_driver_get_num_rows) (dbCursor *) = db__driver_get_num_rows;
> +int (*db_driver_begin_transaction) (void) = db__driver_begin_transaction;
> +int (*db_driver_commit_transaction) (void) = db__driver_commit_transaction;
> +int (*db_driver_update) (dbCursor *) = db__driver_update;
> #else
> -extern int (*db_driver_add_column) ();
> -extern int (*db_driver_bind_update) ();
> -extern int (*db_driver_close_cursor) ();
> -extern int (*db_driver_close_database) ();
> -extern int (*db_driver_create_index) ();
> -extern int (*db_driver_create_table) ();
> -extern int (*db_driver_create_database) ();
> -extern int (*db_driver_delete) ();
> -extern int (*db_driver_delete_database) ();
> -extern int (*db_driver_describe_table) ();
> -extern int (*db_driver_drop_column) ();
> -extern int (*db_driver_drop_index) ();
> -extern int (*db_driver_drop_table) ();
> -extern int (*db_driver_execute_immediate) ();
> -extern int (*db_driver_fetch) ();
> -extern int (*db_driver_find_database) ();
> -extern int (*db_driver_finish) ();
> -extern int (*db_driver_init) ();
> -extern int (*db_driver_insert) ();
> -extern int (*db_driver_list_indexes) ();
> -extern int (*db_driver_list_tables) ();
> -extern int (*db_driver_list_databases) ();
> -extern int (*db_driver_open_insert_cursor) ();
> -extern int (*db_driver_open_select_cursor) ();
> -extern int (*db_driver_open_update_cursor) ();
> -extern int (*db_driver_open_database) ();
> -extern int (*db_driver_grant_on_table) ();
> -extern int (*db_driver_get_num_rows) ();
> -extern int (*db_driver_begin_transaction) ();
> -extern int (*db_driver_commit_transaction) ();
> -extern int (*db_driver_update) ();
> +extern int (*db_driver_add_column) (dbString *, dbColumn *);
> +extern int (*db_driver_bind_update) (dbCursor *);
> +extern int (*db_driver_close_cursor) (dbCursor *);
> +extern int (*db_driver_close_database) (void);
> +extern int (*db_driver_create_index) (dbIndex *);
> +extern int (*db_driver_create_table) (dbTable *);
> +extern int (*db_driver_create_database) (dbHandle *);
> +extern int (*db_driver_delete) (dbCursor *);
> +extern int (*db_driver_delete_database) (dbHandle *);
> +extern int (*db_driver_describe_table) (dbString *, dbTable **);
> +extern int (*db_driver_drop_column) (dbString *, dbString *);
> +extern int (*db_driver_drop_index) (dbString *);
> +extern int (*db_driver_drop_table) (dbString *);
> +extern int (*db_driver_execute_immediate) (dbString *);
> +extern int (*db_driver_fetch) (dbCursor *, int, int *);
> +extern int (*db_driver_find_database) (dbHandle *, int *);
> +extern int (*db_driver_finish) (void);
> +extern int (*db_driver_init) (int, char **);
> +extern int (*db_driver_insert) (dbCursor *);
> +extern int (*db_driver_list_indexes) (dbString *, dbIndex **, int *);
> +extern int (*db_driver_list_tables) (dbString **, int *, int);
> +extern int (*db_driver_list_databases) (dbString *, int, dbHandle **, int *);
> +extern int (*db_driver_open_insert_cursor) (dbCursor *);
> +extern int (*db_driver_open_select_cursor) (dbString *, dbCursor *, int);
> +extern int (*db_driver_open_update_cursor) (dbString *, dbString *, dbCursor *, int);
> +extern int (*db_driver_open_database) (dbHandle *);
> +extern int (*db_driver_grant_on_table) (dbString *, int, int);
> +extern int (*db_driver_get_num_rows) (dbCursor *);
> +extern int (*db_driver_begin_transaction) (void);
> +extern int (*db_driver_commit_transaction) (void);
> +extern int (*db_driver_update) (dbCursor *);
> #endif
>
> #endif
>
> Deleted: grass/trunk/lib/db/dbmi_driver/mk_dbstubs_h.sh
> ===================================================================
> --- grass/trunk/lib/db/dbmi_driver/mk_dbstubs_h.sh 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/lib/db/dbmi_driver/mk_dbstubs_h.sh 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -1,29 +0,0 @@
> -#!/bin/sh
> -# generates dbstubs.h
> -
> -tmp=mk_dbstubs_h.tmp.$$
> -cat <<'EOT'> dbstubs.h
> -/* this file was automatically generated by mk_dbstubs_h.sh */
> -#ifndef DBSTUBS_H
> -#define DBSTUBS_H
> -
> -#ifdef DB_DRIVER_C
> -EOT
> -
> -grep -h '^\( *int *\)\?db__driver' ../stubs/*.c | sed \
> - -e 's/^\( *int *\)*/extern int /' \
> - -e 's/ *(.*$/();/' > $tmp
> -cat $tmp >> dbstubs.h
> -sed 's/^extern int *db__\([a-zA-Z_]*\).*$/int (*db_\1)() = db__\1;/' $tmp >> dbstubs.h
> -
> -cat <<'EOT'>> dbstubs.h
> -#else
> -EOT
> -sed 's/^extern int *db__\([a-zA-Z_]*\).*$/extern int (*db_\1)();/' $tmp >> dbstubs.h
> -cat <<'EOT'>> dbstubs.h
> -#endif
> -
> -#endif
> -EOT
> -
> -rm $tmp
>
> Modified: grass/trunk/lib/db/stubs/open_update.c
> ===================================================================
> --- grass/trunk/lib/db/stubs/open_update.c 2015-11-09 03:44:28 UTC (rev 66771)
> +++ grass/trunk/lib/db/stubs/open_update.c 2015-11-09 11:47:38 UTC (rev 66772)
> @@ -2,7 +2,7 @@
>
> int
> db__driver_open_update_cursor(dbString * name, dbString * select,
> - dbCursor * cursor, int *mode)
> + dbCursor * cursor, int mode)
> {
> db_procedure_not_implemented("db_open_update_cursor");
> return DB_FAILED;
>
> _______________________________________________
> grass-commit mailing list
> grass-commit at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/grass-commit
--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
More information about the grass-dev
mailing list