Fix for ticket #46: Report an error if a CREATE TABLE contains two or more

columns with the same name. (CVS 578)

FossilOrigin-Name: ba1953abd04671232cf9e93ab3f962fedbbdc508

diff --git a/manifest b/manifest
index 8f13266e729ee4cc1b06353007fbeca7292a9506..f0bb61b00db9137173c77a3c15d0fd46ffd99644 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#47:\sUse\sa\scast\sto\savoid\sa\swarning\sabout\sdiscarding\sa\s"const"\ninside\sof\shash.c.\s(CVS\s577)
-D 2002-05-21T23:44:30
+C Fix\sfor\sticket\s#46:\sReport\san\serror\sif\sa\sCREATE\sTABLE\scontains\stwo\sor\smore\ncolumns\swith\sthe\ssame\sname.\s(CVS\s578)
+D 2002-05-22T21:27:03
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -20,7 +20,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F src/TODO af7f3cab0228e34149cf98e073aa83d45878e7e6
 F src/btree.c c01b404b9373ae1c0daf7d1f9211c72ead67638e
 F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
-F src/build.c f5aa02e4553ca2db941d6e7f025a180ddc4cea49
+F src/build.c d88ad651bedecba69510d87d734040730305c528
 F src/delete.c c2eae01b76d5418d4ff1768659dfb199c38f0641
 F src/encode.c 346b12b46148506c32038524b95c4631ab46d760
 F src/expr.c 01e1e395392284a3a480c90bd60b3a0fa99aab38
@@ -93,7 +93,7 @@ F test/select5.test c2a6c4a003316ee42cbbd689eebef8fdce0db2ac
 F test/select6.test efb8d0c07a440441db87db2c4ade6904e1407e85
 F test/sort.test 3b996ce7ca385f9cd559944ac0f4027a23aa546b
 F test/subselect.test 335d3dad8d585726c447dfee8d9c4f7383c76b78
-F test/table.test 17b0b6eafa3faaee5545b7a94e6c1ff73f0880f3
+F test/table.test d9fd161dc9a2dbe0795d836336019ea6d0952ef8
 F test/tableapi.test 3c80421a889e1d106df16e5800fa787f0d2914a6
 F test/tclsqlite.test 79deeffd7cd637ca0f06c5dbbf2f44d272079533
 F test/temptable.test daa83489eea2e9aaeeece09675c28be84c72cb67
@@ -134,7 +134,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 55e7d65496624c8e48673d8747f3123786bfedbc
-R c60459d19b1418931f84fad300373577
+P 0c903461533fabca7815e8cccbd3b712bcd22ddc
+R eaf5d8758292d7cdb287f773e215d706
 U drh
-Z 64d1f209f3e121fdef2277757506d4cb
+Z f48c858d25b915a9feadbebd4ae9d048

diff --git a/manifest.uuid b/manifest.uuid
index 5fd54e16dff3b852661e730b7f04abf716d3f4a2..475399c8e4c7efe9d1d62d237e55d0136d195f00 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0c903461533fabca7815e8cccbd3b712bcd22ddc
\ No newline at end of file
+ba1953abd04671232cf9e93ab3f962fedbbdc508
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 23f55a6269c8cfc9d01f26f2c23d6ef66ca50b03..41c5eaccd68935f527aae5ab552a5970b6ac0d01 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -25,7 +25,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.92 2002/05/21 11:38:11 drh Exp $
+** $Id: build.c,v 1.93 2002/05/22 21:27:03 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -502,8 +502,20 @@ void sqliteStartTable(Parse *pParse, Token *pStart, Token *pName, int isTemp){
 */
 void sqliteAddColumn(Parse *pParse, Token *pName){
   Table *p;
-  char **pz;
+  int i;
+  char *z = 0;
   if( (p = pParse->pNewTable)==0 ) return;
+  sqliteSetNString(&z, pName->z, pName->n, 0);
+  if( z==0 ) return;
+  sqliteDequote(z);
+  for(i=0; i<p->nCol; i++){
+    if( sqliteStrICmp(z, p->aCol[i].zName)==0 ){
+      sqliteSetString(&pParse->zErrMsg, "duplicate column name: ", z, 0);
+      pParse->nErr++;
+      sqliteFree(z);
+      return;
+    }
+  }
   if( (p->nCol & 0x7)==0 ){
     Column *aNew;
     aNew = sqliteRealloc( p->aCol, (p->nCol+8)*sizeof(p->aCol[0]));
@@ -511,9 +523,7 @@ void sqliteAddColumn(Parse *pParse, Token *pName){
     p->aCol = aNew;
   }
   memset(&p->aCol[p->nCol], 0, sizeof(p->aCol[0]));
-  pz = &p->aCol[p->nCol++].zName;
-  sqliteSetNString(pz, pName->z, pName->n, 0);
-  sqliteDequote(*pz);
+  p->aCol[p->nCol++].zName = z;
 }
 
 /*

diff --git a/test/table.test b/test/table.test
index 4d3931dd6b1c2114f2dcd96abfda6b059649bc7a..1b403fe2645c7c342a8e0f66b819e1940aa69c16 100644 (file)
--- a/test/table.test
+++ b/test/table.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the CREATE TABLE statement.
 #
-# $Id: table.test,v 1.15 2002/02/21 12:01:28 drh Exp $
+# $Id: table.test,v 1.16 2002/05/22 21:27:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -370,4 +370,13 @@ do_test table-8.8 {
   }
 } {1 {no such table: no_such_table}}
 
+# Make sure we cannot have duplicate column names within a table.
+#
+do_test table-9.1 {
+  catchsql {
+    CREATE TABLE t6(a,b,a);
+  }
+} {1 {duplicate column name: a}}
+
+
 finish_test