Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix a problem with VACUUM and __hidden__ columns. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
13995756ad8b80568aa2f74387788a8c |
| User & Date: | dan 2015-11-19 18:09:05 |
Context
|
2015-11-19
| ||
| 18:11 | Fix problems with the way the IsHiddenColumn() macro is defined. check-in: 126b998c user: drh tags: trunk | |
| 18:09 | Fix a problem with VACUUM and __hidden__ columns. check-in: 13995756 user: dan tags: trunk | |
| 17:55 | When manifesting a view as part of an DELETE or UPDATE, be sure to include the hidden columns in the manifestation. check-in: 28df5dc4 user: drh tags: trunk | |
Changes
Changes to src/insert.c.
1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 |
if( pDest->iPKey!=pSrc->iPKey ){
return 0; /* Both tables must have the same INTEGER PRIMARY KEY */
}
for(i=0; i<pDest->nCol; i++){
Column *pDestCol = &pDest->aCol[i];
Column *pSrcCol = &pSrc->aCol[i];
#ifdef SQLITE_ENABLE_HIDDEN_COLUMNS
if( (pDestCol->colFlags | pSrcCol->colFlags) & COLFLAG_HIDDEN ){
return 0; /* Neither table may have __hidden__ columns */
}
#endif
if( pDestCol->affinity!=pSrcCol->affinity ){
return 0; /* Affinity must be the same on all columns */
}
if( !xferCompatibleCollation(pDestCol->zColl, pSrcCol->zColl) ){
|
> | > |
1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 |
if( pDest->iPKey!=pSrc->iPKey ){
return 0; /* Both tables must have the same INTEGER PRIMARY KEY */
}
for(i=0; i<pDest->nCol; i++){
Column *pDestCol = &pDest->aCol[i];
Column *pSrcCol = &pSrc->aCol[i];
#ifdef SQLITE_ENABLE_HIDDEN_COLUMNS
if( (db->flags & SQLITE_Vacuum)==0
&& (pDestCol->colFlags | pSrcCol->colFlags) & COLFLAG_HIDDEN
){
return 0; /* Neither table may have __hidden__ columns */
}
#endif
if( pDestCol->affinity!=pSrcCol->affinity ){
return 0; /* Affinity must be the same on all columns */
}
if( !xferCompatibleCollation(pDestCol->zColl, pSrcCol->zColl) ){
|
Changes to test/hidden.test.
94 95 96 97 98 99 100 101 |
SELECT * FROM t5;
} {2 3 5 6 8 9}
do_execsql_test 3.2.3 {
SELECT __hidden__a FROM t5;
} {{} {} {}}
finish_test
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
SELECT * FROM t5;
} {2 3 5 6 8 9}
do_execsql_test 3.2.3 {
SELECT __hidden__a FROM t5;
} {{} {} {}}
do_execsql_test 3.3.1 {
CREATE TABLE t5a(a, b, __hidden__c);
CREATE TABLE t6a(a, b, __hidden__c);
INSERT INTO t6a(a, b, __hidden__c) VALUES(1, 2, 3);
INSERT INTO t6a(a, b, __hidden__c) VALUES(4, 5, 6);
INSERT INTO t6a(a, b, __hidden__c) VALUES(7, 8, 9);
}
do_execsql_test 3.3.2 {
INSERT INTO t5a SELECT * FROM t6a;
SELECT * FROM t5a;
} {1 2 4 5 7 8}
do_execsql_test 3.3.3 {
SELECT __hidden__c FROM t5a;
} {{} {} {}}
do_execsql_test 3.4.1 {
CREATE TABLE t5b(a, __hidden__b, c);
CREATE TABLE t6b(a, b, __hidden__c);
INSERT INTO t6b(a, b, __hidden__c) VALUES(1, 2, 3);
INSERT INTO t6b(a, b, __hidden__c) VALUES(4, 5, 6);
INSERT INTO t6b(a, b, __hidden__c) VALUES(7, 8, 9);
}
do_execsql_test 3.4.2 {
INSERT INTO t5b SELECT * FROM t6b;
SELECT * FROM t5b;
} {1 2 4 5 7 8}
do_execsql_test 3.4.3 {
SELECT __hidden__b FROM t5b;
} {{} {} {}}
#-------------------------------------------------------------------------
# Test VACUUM
#
reset_db
do_execsql_test 4.1 {
CREATE TABLE t1(a, __hidden__b, c UNIQUE);
INSERT INTO t1(a, __hidden__b, c) VALUES(1, 2, 3);
INSERT INTO t1(a, __hidden__b, c) VALUES(4, 5, 6);
INSERT INTO t1(a, __hidden__b, c) VALUES(7, 8, 9);
DELETE FROM t1 WHERE __hidden__b = 5;
SELECT rowid, a, __hidden__b, c FROM t1;
} {1 1 2 3 3 7 8 9}
do_execsql_test 4.2 {
VACUUM;
SELECT rowid, a, __hidden__b, c FROM t1;
} {1 1 2 3 3 7 8 9}
finish_test
|