database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Merge recent enhancements from trunk.

Browse Source 
FossilOrigin-Name: b17872363b60edab05a5d382a44038aad91e4d9f
This commit is contained in:
drh
2016-08-19 15:41:24 +00:00
parent 03181c8c27 fcc31545bc
commit b684fd5c4a
12 changed files with 229 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/select.c
View File

@@ -1441,7 +1441,7 @@ static const char *columnTypeImpl(
zOrigTab = pTab->zName;
if( pNC->pParse ){
int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
zOrigDb = pNC->pParse->db->aDb[iDb].zName;
zOrigDb = pNC->pParse->db->aDb[iDb].zDbSName;
}
#else
if( iCol<0 ){