Simplify the computation of types on columns of a view.

FossilOrigin-Name: 772b0db1469c9e1c2728cf65dd070e29c624e75c3a5da72ee1297f15d758dd13

diff --git a/manifest b/manifest
index 425c4602467b9b8f5861c9bdf92c690262f473d5..b9988d900e11ac65feecb49db1d7b09b21d132ea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\senable\sSELECT\stracing\swith\s-DSQLITE_DEBUG.\s\sRequire\sthe\n-DSQLITE_ENABLE_SELECTTRACE\scompile-time\soption\sto\senable\sSELECT\stracing.
-D 2017-10-03T18:35:57.160
+C Simplify\sthe\scomputation\sof\stypes\son\scolumns\sof\sa\sview.
+D 2017-10-03T19:53:12.453
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 764d5ac2bc4d96a9183d8ee3067f19ef4133aa84788d89875e9626f906703171
+F src/select.c fa9fd8750cc55c4367a77fcf1911a770049c947d26d4a3b1e2b9eebf63425f0a
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1dd828088d6981dfebf9f4d650dad8431bece4405650c61f90eb8d8f43289b52
-R ff9a44814ead03fb339e5473f4e89eb3
+P f5c395834c2a776beba6fe172cc4a5e428ce30b9cb4259ef8e440f10455a41e9
+R 3c121170a1dd33a49ba61d24de5be781
 U drh
-Z 7ee7c6afb266c430d526e6cc80b0cc29
+Z 7bba01406d4dc6644f9e7f5f6c664e0a

diff --git a/manifest.uuid b/manifest.uuid
index bbdc43be852ca86a1e0dd539483f54a85db34614..b336d47568972d034adf8c7536f2361e3c083afe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5c395834c2a776beba6fe172cc4a5e428ce30b9cb4259ef8e440f10455a41e9
\ No newline at end of file
+772b0db1469c9e1c2728cf65dd070e29c624e75c3a5da72ee1297f15d758dd13
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index f628e56f64019c2c99516e8b6fdb595829dbe37e..63078a9a2b60de3059db798499084a8ef6cbf555 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1800,7 +1800,8 @@ void sqlite3SelectAddColumnTypeAndCollation(
     zType = columnType(&sNC, p, 0, 0, 0);
     /* pCol->szEst = ... // Column size est for SELECT tables never used */
     pCol->affinity = sqlite3ExprAffinity(p);
-    if( zType && (m = sqlite3Strlen30(zType))>0 ){
+    if( zType ){
+      m = sqlite3Strlen30(zType);
       n = sqlite3Strlen30(pCol->zName);
       pCol->zName = sqlite3DbReallocOrFree(db, pCol->zName, n+m+2);
       if( pCol->zName ){