Use 'Flags' field in MSysObjects to recognize system tables

This commit is contained in:
whydoubt
2004-09-16 04:00:39 +00:00
parent d5f91ebe63
commit dd99bd0a68
16 changed files with 109 additions and 138 deletions

View File

@@ -79,10 +79,8 @@ int opt;
/* if it's a table */
if (entry->object_type == MDB_TABLE) {
/* skip the MSys tables */
if ((tabname && !strcmp(entry->object_name,tabname)) ||
(!tabname )) {
// && strncmp (entry->object_name, "MSys", 4))) {
(!tabname /* && mdb_is_user_table(entry) */)) {
int ret;
table = mdb_read_table(entry);

View File

@@ -80,18 +80,8 @@ FILE *cfile;
{
entry = g_ptr_array_index (mdb->catalog, i);
/* if it's a table */
if (entry->object_type == MDB_TABLE)
{
/* skip the MSys tables */
if (strncmp (entry->object_name, "MSys", 4))
{
/* make sure it's a table (may be redundant) */
if (!strcmp (mdb_get_objtype_string (entry->object_type), "Table"))
{
if (!mdb_is_user_table(entry))
continue;
fprintf (typesfile, "typedef struct _%s\n", entry->object_name);
fprintf (typesfile, "{\n");
@@ -147,9 +137,6 @@ FILE *cfile;
fprintf (cfile, "}\n\n");
mdb_free_tabledef(table);
}
}
}
}
fclose (typesfile);

View File

@@ -61,9 +61,6 @@ main (int argc, char **argv)
break;
}
}
if (!namespace) {
namespace = (char *) g_strdup("");
}
mdb_init();
@@ -94,19 +91,12 @@ main (int argc, char **argv)
fprintf(stdout,"-- Check out http://mdbtools.sourceforge.net\n");
fprintf(stdout,"-------------------------------------------------------------\n\n");
/* loop over each entry in the catalog */
for (i=0; i < mdb->num_catalog; i++) {
entry = g_ptr_array_index (mdb->catalog, i);
/* if it's a table */
if (entry->object_type == MDB_TABLE) {
/* skip the MSys tables */
if ((tabname && !strcmp(entry->object_name,tabname)) ||
(!tabname && strncmp (entry->object_name, "MSys", 4))) {
generate_table_schema(entry, namespace, s);
if ((tabname && !strcmp(entry->object_name, tabname))
|| (!tabname && mdb_is_user_table(entry))) {
generate_table_schema(entry, namespace, s);
}
}
}
@@ -134,16 +124,13 @@ generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize)
unsigned int i;
MdbColumn *col;
/* make sure it's a table (may be redundant) */
if (strcmp (mdb_get_objtype_string (entry->object_type), "Table"))
return;
/* drop the table if it exists */
fprintf (stdout, "DROP TABLE %s%s;\n", namespace, sanitize_name(entry->object_name,sanitize));
fprintf (stdout, "DROP TABLE %s%s;\n", (namespace) ? namespace : "",
sanitize_name(entry->object_name, sanitize));
/* create the table */
fprintf (stdout, "CREATE TABLE %s%s\n", namespace, sanitize_name(entry->object_name,sanitize));
fprintf (stdout, "CREATE TABLE %s%s\n", (namespace) ? namespace : "",
sanitize_name(entry->object_name, sanitize));
fprintf (stdout, " (\n");
table = mdb_read_table (entry);

View File

@@ -136,18 +136,17 @@ main (int argc, char **argv)
for (i=0; i < mdb->num_catalog; i++) {
entry = g_ptr_array_index (mdb->catalog, i);
/* if it's a table */
if (entry->object_type == objtype) {
/* skip the MSys tables */
if (!skip_sys || strncmp (entry->object_name, "MSys", 4)) {
if (line_break)
fprintf (stdout, "%s\n", entry->object_name);
else if (delimiter)
fprintf (stdout, "%s%s", entry->object_name, delimiter);
else
fprintf (stdout, "%s ", entry->object_name);
}
}
if (entry->object_type != objtype)
continue;
if (skip_sys && mdb_is_system_table(entry))
continue;
if (line_break)
fprintf (stdout, "%s\n", entry->object_name);
else if (delimiter)
fprintf (stdout, "%s%s", entry->object_name, delimiter);
else
fprintf (stdout, "%s ", entry->object_name);
}
if (!line_break)
fprintf (stdout, "\n");