lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix infinite loop exporting SQLite schema

Browse Source
This commit is contained in:
Evan Miller 2020-12-29 09:24:31 -05:00
parent 538711e450
commit aeee354405
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libmdb/backend.c
View File

@ -372,7 +372,7 @@ void mdb_init_backends(MdbHandle *mdb)
"COMMENT %s", "COMMENT %s",
quote_schema_name_rquotes_merge); quote_schema_name_rquotes_merge);
mdb_register_backend(mdb, "sqlite", mdb_register_backend(mdb, "sqlite",
MDB_SHEXP_DROPTABLE|MDB_SHEXP_RELATIONS|MDB_SHEXP_DEFVALUES|MDB_SHEXP_BULK_INSERT, MDB_SHEXP_DROPTABLE|MDB_SHEXP_DEFVALUES|MDB_SHEXP_BULK_INSERT,
mdb_sqlite_types, NULL, NULL, mdb_sqlite_types, NULL, NULL,
"date('now')", "date('now')", "date('now')", "date('now')",
"%Y-%m-%d %H:%M:%S", "%Y-%m-%d %H:%M:%S",
@ -652,9 +652,7 @@ mdb_get_relationships(MdbHandle *mdb, const gchar *dbnamespace, const char* tabl
} else if (!strcmp(mdb->backend_name, "postgres")) { } else if (!strcmp(mdb->backend_name, "postgres")) {
backend = MDB_BACKEND_POSTGRES; backend = MDB_BACKEND_POSTGRES;
} else if (!mdb->relationships_table) { } else if (!mdb->relationships_table) {
return (char *) g_strconcat( return NULL;
"-- relationships are not implemented for ",
mdb->backend_name, "\n", NULL);
} }
if (!mdb->relationships_table) { if (!mdb->relationships_table) {
@ -988,9 +986,16 @@ mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *dbnamespace
if (export_options & MDB_SHEXP_RELATIONS) { if (export_options & MDB_SHEXP_RELATIONS) {
fputs ("-- CREATE Relationships ...\n", outfile); fputs ("-- CREATE Relationships ...\n", outfile);
while ((the_relation=mdb_get_relationships(mdb, dbnamespace, tabname)) != NULL) { the_relation=mdb_get_relationships(mdb, dbnamespace, tabname);
fputs(the_relation, outfile); if (!the_relation) {
g_free(the_relation); fputs("-- relationships are not implemented for ", outfile);
fputs(mdb->backend_name, outfile);
fputs("\n", outfile);
} else {
do {
fputs(the_relation, outfile);
g_free(the_relation);
} while ((the_relation=mdb_get_relationships(mdb, dbnamespace, tabname)) != NULL);
} }
} }
} }