/ Check-in [4115c0c2]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge leaves [7cd178a72a] and [598727e6da].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4115c0c286052e32cb81f77a644d530c1766206f
User & Date: dan 2009-11-19 18:30:14
Context
2009-11-20
02:24
Minor optimizations to fts3 code. check-in: b456eacb user: dan tags: trunk
2009-11-19
18:30
Merge leaves [7cd178a72a] and [598727e6da]. check-in: 4115c0c2 user: dan tags: trunk
18:28
Fix a performance regression introduced while reworking the fts3 code. check-in: 7cd178a7 user: dan tags: trunk
15:44
Remove an unreachable branch from the OP_Affinity suppression logic. check-in: 598727e6 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/expr.c.

1332
1333
1334
1335
1336
1337
1338

1339
1340
1341
1342
1343
1344
1345
1346
1347
    case TK_STRING: {
      return aff==SQLITE_AFF_TEXT;
    }
    case TK_BLOB: {
      return 1;
    }
    case TK_COLUMN: {

      return p->iTable>=0 && p->iColumn<0
               && (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
    }
    default: {
      return 0;
    }
  }
}








>
|
|







1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
    case TK_STRING: {
      return aff==SQLITE_AFF_TEXT;
    }
    case TK_BLOB: {
      return 1;
    }
    case TK_COLUMN: {
      assert( p->iTable>=0 );  /* p cannot be part of a CHECK constraint */
      return p->iColumn<0
          && (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
    }
    default: {
      return 0;
    }
  }
}