commit 4a32431ce7c94176cb146d3776e192b45fe92d57
author drh <drh@noemail.net> Fri Dec 21 14:30:42 2001 +0000
committer drh <drh@noemail.net> Fri Dec 21 14:30:42 2001 +0000
tree 574800b0a2869e96c723eb885ccbb4ff204a416c
parent 7c917d196f3e9fbe7af324707dde461f54e9da0c

Added support for the INTEGER PRIMARY KEY column type. (CVS 333)

FossilOrigin-Name: 236a54d289e858a1e0505a20d907a2a40c01b521

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index fc7e7f8..37f4d28 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.34 2001/11/24 00:31:46 drh Exp $
+** $Id: expr.c,v 1.35 2001/12/21 14:30:43 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -127,7 +127,12 @@
           if( sqliteStrICmp(pTab->aCol[j].zName, z)==0 ){
             cnt++;
             pExpr->iTable = i + pParse->nTab;
-            pExpr->iColumn = j;
+            if( j==pTab->iPKey ){
+              /* Substitute the record number for the INTEGER PRIMARY KEY */
+              pExpr->iColumn = -1;
+            }else{
+              pExpr->iColumn = j;
+            }
           }
         }
       }
@@ -190,7 +195,12 @@
           if( sqliteStrICmp(pTab->aCol[j].zName, zRight)==0 ){
             cnt++;
             pExpr->iTable = i + pParse->nTab;
-            pExpr->iColumn = j;
+            if( j==pTab->iPKey ){
+              /* Substitute the record number for the INTEGER PRIMARY KEY */
+              pExpr->iColumn = -1;
+            }else{
+              pExpr->iColumn = j;
+            }
           }
         }
       }