improve SQL style: avoid "SELECT *", be explicit in what columns we want;

suggested by espie@.

diff --git a/mandocdb.c b/mandocdb.c
index 0fc16443601df6d018e74442852ab9a04df14112..78ce121792ef5da38687bad777eae01da08aa752 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.141 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.142 2014/04/23 16:34:50 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1287,7 +1287,8 @@ names_check(void)
              "AND mlinks.name == names.name"
            ")"
          ") JOIN ("
              "AND mlinks.name == names.name"
            ")"
          ") JOIN ("

-           "SELECT * FROM mlinks GROUP BY pageid"
+           "SELECT sec, arch, name, pageid FROM mlinks "
+           "GROUP BY pageid"

          ") USING (pageid);",
          -1, &stmt, NULL);
 
          ") USING (pageid);",
          -1, &stmt, NULL);
 

diff --git a/mansearch.c b/mansearch.c
index fb2de0094711c734feb4fc2eae484c07016232f6..eec5ff132be318febfdfbdaecf00a22bbb777c59 100644 (file)
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.c,v 1.34 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: mansearch.c,v 1.35 2014/04/23 16:34:50 schwarze Exp $ */

 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -310,14 +310,15 @@ mansearch(const struct mansearch *search,
                sqlite3_finalize(s);
 
                c = sqlite3_prepare_v2(db,
                sqlite3_finalize(s);
 
                c = sqlite3_prepare_v2(db,

-                   "SELECT * FROM mlinks WHERE pageid=?"
-                   " ORDER BY sec, arch, name",
+                   "SELECT sec, arch, name, pageid FROM mlinks "
+                   "WHERE pageid=? ORDER BY sec, arch, name",

                    -1, &s, NULL);
                if (SQLITE_OK != c)
                        fprintf(stderr, "%s\n", sqlite3_errmsg(db));
 
                c = sqlite3_prepare_v2(db,
                    -1, &s, NULL);
                if (SQLITE_OK != c)
                        fprintf(stderr, "%s\n", sqlite3_errmsg(db));
 
                c = sqlite3_prepare_v2(db,

-                   "SELECT * FROM keys WHERE pageid=? AND bits & ?",
+                   "SELECT bits, key, pageid FROM keys "
+                   "WHERE pageid=? AND bits & ?",

                    -1, &s2, NULL);
                if (SQLITE_OK != c)
                        fprintf(stderr, "%s\n", sqlite3_errmsg(db));
                    -1, &s2, NULL);
                if (SQLITE_OK != c)
                        fprintf(stderr, "%s\n", sqlite3_errmsg(db));


@@ -542,7 +543,8 @@ sql_statement(const struct expr *e)
        size_t           sz;
        int              needop;
 
        size_t           sz;
        int              needop;
 

-       sql = mandoc_strdup("SELECT * FROM mpages WHERE ");
+       sql = mandoc_strdup(
+           "SELECT desc, form, pageid FROM mpages WHERE ");

        sz = strlen(sql);
 
        for (needop = 0; NULL != e; e = e->next) {
        sz = strlen(sql);
 
        for (needop = 0; NULL != e; e = e->next) {