luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support for case sensitive schema names.

Browse source 
[GB.DB]
* BUG: Support for case sensitive schema names.

[GB.DB.POSTGRESQL]
* BUG: Support for case sensitive schema names.
This commit is contained in:
gambas 2018-04-18 03:17:30 +02:00
parent 87f546bb81
commit 6712de717c
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gb.db.postgresql/src/main.c
View file

@ -177,8 +177,8 @@ static char *get_quoted_table(const char *table)
}
else
{
res = GB.TempString(NULL, len + 2);
sprintf(res, "%.*s.\"%s\"", (int)(point - table), table, point + 1);
res = GB.TempString(NULL, len + 4);
sprintf(res, "\"%.*s\".\"%s\"", (int)(point - table), table, point + 1);
}
return res;
@ -187,6 +187,7 @@ static char *get_quoted_table(const char *table)
static bool get_table_schema(const char **table, char **schema)
{
char *point;
int len;
//fprintf(stderr, "get_table_schema: %s\n", *table);
@ -201,14 +202,19 @@ static bool get_table_schema(const char **table, char **schema)
point = strchr(*table, '.');
if (!point)
{
//fprintf(stderr, "get_table_schema: -> No point\n");
*schema = "public";
return FALSE;
}
*schema = GB.TempString(*table, point - *table);
*table = point + 1;
//fprintf(stderr, "get_table_schema: -> %s / %s\n", *schema, *table);
else
{
len = point - *table;
if (len >= 3 && **table == '"' && (*table)[len - 1] == '"')
*schema = GB.TempString(*table + 1, len - 2);
else
*schema = GB.TempString(*table, len);
*table = point + 1;
}
return FALSE;
}

7
main/lib/db/main.c
View file

@ -613,14 +613,17 @@ char *DB_GetQuotedTable(DB_DRIVER *driver, DB_DATABASE *db, const char *table, i
quote = (*driver->GetQuote)();
res = GB.TempString(NULL, len + 2);
if (!point)
{
res = GB.TempString(NULL, len + 2);
sprintf(res, "%s%.*s%s", quote, len, table, quote);
}
else
{
int len_schema = (int)(point - table);
sprintf(res, "%.*s.%s%.*s%s", len_schema, table, quote, len - len_schema - 1, point + 1, quote);
res = GB.TempString(NULL, len + 4);
sprintf(res, "%s%.*s%s.%s%.*s%s", quote, len_schema, table, quote, quote, len - len_schema - 1, point + 1, quote);
}
return res;