lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-01-22 02:52:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up backend export logic

Browse Source 
* Differentiate character lengths from byte lengths (see #112)

* Use GNU-style indexed initializers for clarity

* Remove needs_quotes since it's not used anywhere
This commit is contained in:
Evan Miller
2021-01-19 18:03:10 -05:00
parent dbc1aa7ea2
commit 9e85bc4153
2 changed files with 101 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/mdbtools.h
View File

@@ -210,9 +210,10 @@ typedef struct mdbsargtree MdbSargNode;
typedef struct { typedef struct {
char *name; char *name;
unsigned char needs_length; /* or precision */ unsigned char needs_precision;
unsigned char needs_scale; unsigned char needs_scale;
unsigned char needs_quotes; unsigned char needs_byte_length;
unsigned char needs_char_length;
} MdbBackendType; } MdbBackendType;
typedef struct { typedef struct {

203
src/libmdb/backend.c
View File

@@ -24,90 +24,78 @@
/* Access data types */ /* Access data types */
static const MdbBackendType mdb_access_types[] = { static const MdbBackendType mdb_access_types[] = {
{ .name = "Unknown 0x00" }, [MDB_BOOL] = { .name = "Boolean" },
{ .name = "Boolean" }, [MDB_BYTE] = { .name = "Byte" },
{ .name = "Byte" }, [MDB_INT] = { .name = "Integer" },
{ .name = "Integer" }, [MDB_LONGINT] = { .name = "Long Integer" },
{ .name = "Long Integer" }, [MDB_MONEY] = { .name = "Currency" },
{ .name = "Currency" }, [MDB_FLOAT] = { .name = "Single" },
{ .name = "Single" }, [MDB_DOUBLE] = { .name = "Double" },
{ .name = "Double" }, [MDB_DATETIME] = { .name = "DateTime" },
{ .name = "DateTime", .needs_quotes = 1 }, [MDB_BINARY] = { .name = "Binary" },
{ .name = "Binary" }, [MDB_TEXT] = { .name = "Text", .needs_char_length = 1 },
{ .name = "Text", .needs_length = 1, .needs_quotes = 1 }, [MDB_OLE] = { .name = "OLE", .needs_byte_length = 1 },
{ .name = "OLE", .needs_length = 1, .needs_quotes = 1 }, [MDB_MEMO] = { .name = "Memo/Hyperlink", .needs_char_length = 1 },
{ .name = "Memo/Hyperlink", .needs_length = 1, .needs_quotes = 1 }, [MDB_REPID] = { .name = "Replication ID" },
{ .name = "Unknown 0x0d" }, [MDB_NUMERIC] = { .name = "Numeric", .needs_precision = 1, .needs_scale = 1 },
{ .name = "Unknown 0x0e" },
{ .name = "Replication ID" },
{ .name = "Numeric", .needs_length = 1, .needs_scale = 1 },
}; };
/* Oracle data types */ /* Oracle data types */
static const MdbBackendType mdb_oracle_types[] = { static const MdbBackendType mdb_oracle_types[] = {
{ .name = "Oracle_Unknown 0x00" }, [MDB_BOOL] = { .name = "NUMBER(1)" },
{ .name = "NUMBER(1)" }, [MDB_BYTE] = { .name = "NUMBER(3)" },
{ .name = "NUMBER(3)" }, [MDB_INT] = { .name = "NUMBER(5)" },
{ .name = "NUMBER(5)" }, [MDB_LONGINT] = { .name = "NUMBER(11)" },
{ .name = "NUMBER(11)" }, [MDB_MONEY] = { .name = "NUMBER(15,2)" },
{ .name = "NUMBER(15,2)" }, [MDB_FLOAT] = { .name = "FLOAT" },
{ .name = "FLOAT" }, [MDB_DOUBLE] = { .name = "FLOAT" },
{ .name = "FLOAT" }, [MDB_DATETIME] = { .name = "TIMESTAMP" },
{ .name = "TIMESTAMP" }, [MDB_BINARY] = { .name = "BINARY" },
{ .name = "BINARY" }, [MDB_TEXT] = { .name = "VARCHAR2", .needs_char_length= 1 },
{ .name = "VARCHAR2", .needs_length = 1, .needs_quotes = 1 }, [MDB_OLE] = { .name = "BLOB" },
{ .name = "BLOB" }, [MDB_MEMO] = { .name = "CLOB" },
{ .name = "CLOB" }, [MDB_REPID] = { .name = "NUMBER", .needs_precision = 1 },
{ .name = "Oracle_Unknown 0x0d" }, [MDB_NUMERIC] = { .name = "NUMBER", .needs_precision = 1 },
{ .name = "Oracle_Unknown 0x0e" },
{ .name = "NUMBER", .needs_length = 1 },
{ .name = "NUMBER", .needs_length = 1 },
}; };
static const MdbBackendType mdb_oracle_shortdate_type = static const MdbBackendType mdb_oracle_shortdate_type =
{ .name = "DATE" }; { .name = "DATE" };
/* Sybase/MSSQL data types */ /* Sybase/MSSQL data types */
static const MdbBackendType mdb_sybase_types[] = { static const MdbBackendType mdb_sybase_types[] = {
{ .name = "Sybase_Unknown 0x00" }, [MDB_BOOL] = { .name = "bit" },
{ .name = "bit" }, [MDB_BYTE] = { .name = "char", .needs_byte_length = 1 },
{ .name = "char", .needs_length = 1, .needs_quotes = 1 }, [MDB_INT] = { .name = "smallint" },
{ .name = "smallint" }, [MDB_LONGINT] = { .name = "int" },
{ .name = "int" }, [MDB_MONEY] = { .name = "money" },
{ .name = "money" }, [MDB_FLOAT] = { .name = "real" },
{ .name = "real" }, [MDB_DOUBLE] = { .name = "float" },
{ .name = "float" }, [MDB_DATETIME] = { .name = "smalldatetime" },
{ .name = "smalldatetime" }, [MDB_BINARY] = { .name = "varbinary", .needs_byte_length = 1 },
{ .name = "Sybase_Unknown 0x09" }, [MDB_TEXT] = { .name = "nvarchar", .needs_char_length = 1 },
{ .name = "varchar", .needs_length = 1, .needs_quotes = 1 }, [MDB_OLE] = { .name = "varbinary(max)" },
{ .name = "varbinary", .needs_length = 1, .needs_quotes = 1 }, [MDB_MEMO] = { .name = "nvarchar(max)" },
{ .name = "text", .needs_length = 1, .needs_quotes = 1 }, [MDB_REPID] = { .name = "Sybase_Replication ID" },
{ .name = "Sybase_Unknown 0x0d" }, [MDB_NUMERIC] = { .name = "numeric", .needs_precision = 1, .needs_scale = 1 },
{ .name = "Sybase_Unknown 0x0e" },
{ .name = "Sybase_Replication ID" },
{ .name = "numeric", .needs_length = 1, .needs_scale = 1 },
}; };
static const MdbBackendType mdb_sybase_shortdate_type = static const MdbBackendType mdb_sybase_shortdate_type =
{ .name = "DATE" }; { .name = "DATE" };
/* Postgres data types */ /* Postgres data types */
static const MdbBackendType mdb_postgres_types[] = { static const MdbBackendType mdb_postgres_types[] = {
{ .name = "Postgres_Unknown 0x00" }, [MDB_BOOL] = { .name = "BOOL" },
{ .name = "BOOL" }, [MDB_BYTE] = { .name = "SMALLINT" },
{ .name = "SMALLINT" }, [MDB_INT] = { .name = "INTEGER" },
{ .name = "INTEGER" }, [MDB_LONGINT] = { .name = "INTEGER" }, /* bigint */
{ .name = "INTEGER" }, /* bigint */ [MDB_MONEY] = { .name = "NUMERIC(15,2)" }, /* money deprecated ? */
{ .name = "NUMERIC(15,2)" }, /* money deprecated ? */ [MDB_FLOAT] = { .name = "REAL" },
{ .name = "REAL" }, [MDB_DOUBLE] = { .name = "DOUBLE PRECISION" },
{ .name = "DOUBLE PRECISION" }, [MDB_DATETIME] = { .name = "TIMESTAMP WITHOUT TIME ZONE" },
{ .name = "TIMESTAMP WITHOUT TIME ZONE" }, [MDB_BINARY] = { .name = "BYTEA" },
{ .name = "BYTEA" }, [MDB_TEXT] = { .name = "VARCHAR", .needs_char_length = 1 },
{ .name = "VARCHAR", .needs_length = 1, .needs_quotes = 1 }, [MDB_OLE] = { .name = "BYTEA" },
{ .name = "BYTEA" }, [MDB_MEMO] = { .name = "TEXT" },
{ .name = "TEXT" }, [MDB_REPID] = { .name = "UUID" },
{ .name = "Postgres_Unknown 0x0d" }, [MDB_NUMERIC] = { .name = "NUMERIC", .needs_precision = 1, .needs_scale = 1 },
{ .name = "Postgres_Unknown 0x0e" },
{ .name = "UUID" },
{ .name = "NUMERIC", .needs_length = 1, .needs_scale = 1 },
}; };
static const MdbBackendType mdb_postgres_shortdate_type = static const MdbBackendType mdb_postgres_shortdate_type =
{ .name = "DATE" }; { .name = "DATE" };
@@ -116,46 +104,40 @@ static const MdbBackendType mdb_postgres_serial_type =
/* MySQL data types */ /* MySQL data types */
static const MdbBackendType mdb_mysql_types[] = { static const MdbBackendType mdb_mysql_types[] = {
{ .name = "text", .needs_quotes = 1 }, [MDB_BOOL] = { .name = "boolean" },
{ .name = "boolean" }, [MDB_BYTE] = { .name = "tinyint" },
{ .name = "tinyint" }, [MDB_INT] = { .name = "smallint" },
{ .name = "smallint" }, [MDB_LONGINT] = { .name = "int" },
{ .name = "int" }, [MDB_MONEY] = { .name = "float" },
{ .name = "float" }, [MDB_FLOAT] = { .name = "float" },
{ .name = "float" }, [MDB_DOUBLE] = { .name = "float" },
{ .name = "float" }, [MDB_DATETIME] = { .name = "datetime" },
{ .name = "datetime", .needs_quotes = 1 }, [MDB_BINARY] = { .name = "blob" },
{ .name = "varchar", .needs_length = 1, .needs_quotes = 1 }, [MDB_TEXT] = { .name = "varchar", .needs_char_length = 1 },
{ .name = "varchar", .needs_length = 1, .needs_quotes = 1 }, [MDB_OLE] = { .name = "varbinary", .needs_byte_length = 1 },
{ .name = "varchar", .needs_length = 1, .needs_quotes = 1 }, [MDB_MEMO] = { .name = "text" },
{ .name = "text", .needs_quotes = 1 }, [MDB_REPID] = { .name = "char(38)" },
{ .name = "blob" }, [MDB_NUMERIC] = { .name = "numeric", .needs_precision = 1, .needs_scale = 1 },
{ .name = "text", .needs_quotes = 1 },
{ .name = "char(38)" },
{ .name = "numeric", .needs_length = 1, .needs_scale = 1 },
}; };
static const MdbBackendType mdb_mysql_shortdate_type = static const MdbBackendType mdb_mysql_shortdate_type =
{ .name = "date" }; { .name = "date" };
/* sqlite data types */ /* sqlite data types */
static const MdbBackendType mdb_sqlite_types[] = { static const MdbBackendType mdb_sqlite_types[] = {
{ .name = "BLOB" }, [MDB_BOOL] = { .name = "INTEGER" },
{ .name = "INTEGER" }, [MDB_BYTE] = { .name = "INTEGER" },
{ .name = "INTEGER" }, [MDB_INT] = { .name = "INTEGER" },
{ .name = "INTEGER" }, [MDB_LONGINT] = { .name = "INTEGER" },
{ .name = "INTEGER" }, [MDB_MONEY] = { .name = "REAL" },
{ .name = "REAL" }, [MDB_FLOAT] = { .name = "REAL" },
{ .name = "REAL" }, [MDB_DOUBLE] = { .name = "REAL" },
{ .name = "REAL" }, [MDB_DATETIME] = { .name = "DateTime" },
{ .name = "DateTime", .needs_quotes = 1 }, [MDB_BINARY] = { .name = "BLOB" },
{ .name = "BLOB", .needs_quotes = 1 }, [MDB_TEXT] = { .name = "varchar" },
{ .name = "varchar", .needs_quotes = 1 }, [MDB_OLE] = { .name = "BLOB" },
{ .name = "BLOB", .needs_quotes = 1 }, [MDB_MEMO] = { .name = "TEXT" },
{ .name = "TEXT", .needs_quotes = 1 }, [MDB_REPID] = { .name = "INTEGER" },
{ .name = "BLOB", .needs_quotes = 1 }, [MDB_NUMERIC] = { .name = "INTEGER" },
{ .name = "BLOB", .needs_quotes = 1 },
{ .name = "INTEGER" },
{ .name = "INTEGER" },
}; };
enum { enum {
@@ -257,7 +239,7 @@ const MdbBackendType*
mdb_get_colbacktype(const MdbColumn *col) { mdb_get_colbacktype(const MdbColumn *col) {
MdbBackend *backend = col->table->entry->mdb->default_backend; MdbBackend *backend = col->table->entry->mdb->default_backend;
int col_type = col->col_type; int col_type = col->col_type;
if (col_type > 0x10 ) if (col_type > MDB_NUMERIC)
return NULL; return NULL;
if (col_type == MDB_LONGINT && col->is_long_auto && backend->type_autonum) if (col_type == MDB_LONGINT && col->is_long_auto && backend->type_autonum)
return backend->type_autonum; return backend->type_autonum;
@@ -265,6 +247,8 @@ mdb_get_colbacktype(const MdbColumn *col) {
if (mdb_col_is_shortdate(col)) if (mdb_col_is_shortdate(col))
return backend->type_shortdate; return backend->type_shortdate;
} }
if (!backend->types_table[col_type].name[0])
return NULL;
return &backend->types_table[col_type]; return &backend->types_table[col_type];
} }
@@ -275,7 +259,7 @@ mdb_get_colbacktype_string(const MdbColumn *col)
if (!type) { if (!type) {
// return NULL; // return NULL;
static __thread char buf[16]; static __thread char buf[16];
snprintf(buf, sizeof(buf), "type %04x", col->col_type); snprintf(buf, sizeof(buf), "Unknown_%04x", col->col_type);
return buf; return buf;
} }
return type->name; return type->name;
@@ -285,7 +269,14 @@ mdb_colbacktype_takes_length(const MdbColumn *col)
{ {
const MdbBackendType *type = mdb_get_colbacktype(col); const MdbBackendType *type = mdb_get_colbacktype(col);
if (!type) return 0; if (!type) return 0;
return type->needs_length; return type->needs_precision || type->needs_char_length || type->needs_byte_length;
}
static int
mdb_colbacktype_takes_length_in_characters(const MdbColumn *col)
{
const MdbBackendType *type = mdb_get_colbacktype(col);
if (!type) return 0;
return type->needs_char_length;
} }
/** /**
@@ -810,6 +801,8 @@ generate_table_schema(FILE *outfile, MdbCatalogEntry *entry, char *dbnamespace,
fputs(" (255)", outfile); fputs(" (255)", outfile);
else if (col->col_scale != 0) else if (col->col_scale != 0)
fprintf(outfile, " (%d, %d)", col->col_scale, col->col_prec); fprintf(outfile, " (%d, %d)", col->col_scale, col->col_prec);
else if (!IS_JET3(mdb) && mdb_colbacktype_takes_length_in_characters(col))
fprintf(outfile, " (%d)", col->col_size/2);
else else
fprintf(outfile, " (%d)", col->col_size); fprintf(outfile, " (%d)", col->col_size);
} }