Merged branch 'master' of git://git.tokkee.org/sysdb.

diff --cc src/frontend/analyzer.c
Simple merge

diff --cc src/frontend/grammar.y
Simple merge

diff --cc t/unit/frontend/parser_test.c
index c377f78fa59a9acd359de8fdeb560fce0013ce52,2368bcc4d3efe821a5342aa25ee07316ff69e7e1..c5b514fde5156fa43fafed5a714e6ffbd2e768cf
--- 1/t/unit/frontend/parser_test.c
--- 2/t/unit/frontend/parser_test.c
+++ b/t/unit/frontend/parser_test.c
@@@ -183,15 -183,9 +183,15 @@@ START_TEST(test_parse
                 *
                { "LOOKUP hosts MATCHING "
                  "attribute['foo'] = "
-                 "1Y42D",               -1,  1, CONNECTION_LOOKUP },
+                 "1Y42D",               -1,  1, SDB_CONNECTION_LOOKUP },
                 */
  
-                 "backend = ['foo']",   -1,  1, CONNECTION_LOOKUP },
 +              /* array constants */
 +              { "LOOKUP hosts MATCHING "
-                 "backend = ['a','b']", -1,  1, CONNECTION_LOOKUP },
++                "backend = ['foo']",   -1,  1, SDB_CONNECTION_LOOKUP },
 +              { "LOOKUP hosts MATCHING "
++                "backend = ['a','b']", -1,  1, SDB_CONNECTION_LOOKUP },
 +
                /* NULL */
                { "LOOKUP hosts MATCHING "
                  "attribute['foo'] "