The table_info pragma shows column affinity as "" if there is no column

affinity.  Ticket #1570. (CVS 3122)

FossilOrigin-Name: 5cae8d63d9c83f481bd2fbbcfed69df631062651

diff --git a/manifest b/manifest
index 999183e97c71c607a3d2e73c1bdfa0ac3a11f79c..8fac640cfc7699028b6aba46a29c9b236798ae5d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sdefault\sbusy\shandler\suses\susleep()\swhen\savailable.\nTicket\s#1684.\s(CVS\s3121)
-D 2006-03-03T20:54:41
+C The\stable_info\spragma\sshows\scolumn\saffinity\sas\s""\sif\sthere\sis\sno\scolumn\naffinity.\s\sTicket\s#1570.\s(CVS\s3122)
+D 2006-03-03T21:20:17
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -62,7 +62,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c f65d0b05182ff6059e9566b2eed1ec5f0cddc2f6
 F src/pager.h 425a9e52d5404158de016799715cbc2c3d685178
 F src/parse.y c2daaa24fa2c8e256af740f29d3d61ac552fbd49
-F src/pragma.c 607b0f3b1916aa01918acd08499bd6ef21065c23
+F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55
 F src/prepare.c cf0fc8ebaf94409955ecb09ffeb0099c9ef44693
 F src/printf.c cda33918f602ff20bfba3ceae642ac1ed8f476d6
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
@@ -212,7 +212,7 @@ F test/pager.test 6ee95e90ee8295e376e39a6c6566ef6df993601a
 F test/pager2.test 49c0f57c7da0b060f0486b85fdd074025caa694e
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pagesize.test 05c74ea49f790734ec1e9ab765d9bf1cce79b8f2
-F test/pragma.test 3e3673e42c665bf5ec1673961927ff9547a819fc
+F test/pragma.test 745f51617fc8e72c9f202a1149b2b362d030a67c
 F test/printf.test 9e10c74e16bf889f8495ddb3d6f5f891e75ff1b7
 F test/progress.test 16496001da445e6534afb94562c286708316d82f x
 F test/quick.test e220b3b6e62fe4fb4e2a703ab2ba730fedfe0424
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P ee2f706800849a95cc74a08ba0f25d3728dbe3ec
-R 0e0e8d1eeda9280f1bebcc3e3851741f
+P 43e5462608819e9c2c8bcb4860d4c2d6ecda600c
+R e9ddd59d7d41903afd278f01e6f2d082
 U drh
-Z 26aa9e7456c043f7b46ba0abf72546cb
+Z 0469b7625b6db7391e7c965b77b7a27c

diff --git a/manifest.uuid b/manifest.uuid
index 2fac11bb305c683b3b429b5504291bb0f10c531d..b9adadbfe490c271cdeada8eec670efda5449e10 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43e5462608819e9c2c8bcb4860d4c2d6ecda600c
\ No newline at end of file
+5cae8d63d9c83f481bd2fbbcfed69df631062651
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 3f393773ebed6abe6c7ce3ccf5fc065f71c6eb48..921bdbf185b30ab65e2a91d1aeda86124246c598 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.119 2006/02/17 12:25:16 danielk1977 Exp $
+** $Id: pragma.c,v 1.120 2006/03/03 21:20:17 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -485,7 +485,7 @@ void sqlite3Pragma(
         sqlite3VdbeAddOp(v, OP_Integer, i, 0);
         sqlite3VdbeOp3(v, OP_String8, 0, 0, pCol->zName, 0);
         sqlite3VdbeOp3(v, OP_String8, 0, 0,
-           pCol->zType ? pCol->zType : "numeric", 0);
+           pCol->zType ? pCol->zType : "", 0);
         sqlite3VdbeAddOp(v, OP_Integer, pCol->notNull, 0);
         sqlite3ExprCode(pParse, pCol->pDflt);
         sqlite3VdbeAddOp(v, OP_Integer, pCol->isPrimKey, 0);

diff --git a/test/pragma.test b/test/pragma.test
index 580948038ef53067b919262f367adc6e7059701e..52fdf72b27cf6571e0c235fd2a86f8a22cb4efb1 100644 (file)
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.40 2006/02/17 12:25:16 danielk1977 Exp $
+# $Id: pragma.test,v 1.41 2006/03/03 21:20:17 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -345,7 +345,7 @@ do_test pragma-6.2 {
   execsql {
     pragma table_info(t2)
   }
-} {0 a numeric 0 {} 0 1 b numeric 0 {} 0 2 c numeric 0 {} 0}
+} {0 a {} 0 {} 0 1 b {} 0 {} 0 2 c {} 0 {} 0}
 ifcapable {foreignkey} {
   do_test pragma-6.3 {
     execsql {