Skip to content

Commit ee9a467

Browse files
abathurabathur
committed
sqlite: flip _static default in bindTextParameter
1 parent 2a6f9d5 commit ee9a467

File tree

1 file changed

+62
-63
lines changed

1 file changed

+62
-63
lines changed

‎src/sqlite3gen.cpp

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ class TextGeneratorSqlite3Impl : public TextGeneratorIntf
854854
};
855855

856856

857-
static bool bindTextParameter(SqlStmt &s,const char *name,const char *value, bool _static=TRUE)
857+
static bool bindTextParameter(SqlStmt &s,const char *name,const char *value, bool _static=FALSE)
858858
{
859859
int idx = sqlite3_bind_parameter_index(s.stmt, name);
860860
if (idx==0) {
@@ -909,11 +909,11 @@ static int insertPath(QCString name, bool local=TRUE, bool found=TRUE, int type=
909909

910910
name = stripFromPath(name);
911911

912-
bindTextParameter(path_select,":name",name.data(),FALSE);
912+
bindTextParameter(path_select,":name",name.data());
913913
rowid=step(path_select,TRUE,TRUE);
914914
if (rowid==0)
915915
{
916-
bindTextParameter(path_insert,":name",name.data(),FALSE);
916+
bindTextParameter(path_insert,":name",name.data());
917917
bindIntParameter(path_insert,":type",type);
918918
bindIntParameter(path_insert,":local",local?1:0);
919919
bindIntParameter(path_insert,":found",found?1:0);
@@ -924,13 +924,13 @@ static int insertPath(QCString name, bool local=TRUE, bool found=TRUE, int type=
924924

925925
static void recordMetadata()
926926
{
927-
bindTextParameter(meta_insert,":doxygen_version",getFullVersion(),FALSE);
928-
bindTextParameter(meta_insert,":schema_version","0.2.0"); //TODO: this should be a constant somewhere; not sure where
929-
bindTextParameter(meta_insert,":generated_at",dateToString(TRUE), FALSE);
930-
bindTextParameter(meta_insert,":generated_on",dateToString(FALSE), FALSE);
931-
bindTextParameter(meta_insert,":project_name",Config_getString(PROJECT_NAME),FALSE);
932-
bindTextParameter(meta_insert,":project_number",Config_getString(PROJECT_NUMBER),FALSE);
933-
bindTextParameter(meta_insert,":project_brief",Config_getString(PROJECT_BRIEF),FALSE);
927+
bindTextParameter(meta_insert,":doxygen_version",getFullVersion());
928+
bindTextParameter(meta_insert,":schema_version","0.2.0",TRUE); //TODO: this should be a constant somewhere; not sure where
929+
bindTextParameter(meta_insert,":generated_at",dateToString(TRUE));
930+
bindTextParameter(meta_insert,":generated_on",dateToString(FALSE));
931+
bindTextParameter(meta_insert,":project_name",Config_getString(PROJECT_NAME));
932+
bindTextParameter(meta_insert,":project_number",Config_getString(PROJECT_NUMBER));
933+
bindTextParameter(meta_insert,":project_brief",Config_getString(PROJECT_BRIEF));
934934
step(meta_insert);
935935
}
936936

@@ -948,11 +948,11 @@ struct Refid insertRefid(const char *refid)
948948
ret.created = FALSE;
949949
if (refid==0) return ret;
950950

951-
bindTextParameter(refid_select,":refid",refid,FALSE);
951+
bindTextParameter(refid_select,":refid",refid);
952952
ret.rowid=step(refid_select,TRUE,TRUE);
953953
if (ret.rowid==0)
954954
{
955-
bindTextParameter(refid_insert,":refid",refid,FALSE);
955+
bindTextParameter(refid_insert,":refid",refid);
956956
ret.rowid=step(refid_insert,TRUE);
957957
ret.created = TRUE;
958958
}
@@ -996,7 +996,7 @@ static bool insertMemberReference(struct Refid src_refid, struct Refid dst_refid
996996
}
997997
else
998998
{
999-
bindTextParameter(xrefs_insert,":context",context,FALSE);
999+
bindTextParameter(xrefs_insert,":context",context);
10001000
}
10011001

10021002
step(xrefs_insert);
@@ -1036,8 +1036,8 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co
10361036

10371037
if (!a.attrib.isEmpty())
10381038
{
1039-
bindTextParameter(param_select,":attributes",a.attrib,FALSE);
1040-
bindTextParameter(param_insert,":attributes",a.attrib,FALSE);
1039+
bindTextParameter(param_select,":attributes",a.attrib);
1040+
bindTextParameter(param_insert,":attributes",a.attrib);
10411041
}
10421042
if (!a.type.isEmpty())
10431043
{
@@ -1054,30 +1054,30 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co
10541054
insertMemberReference(src_refid,dst_refid, "argument");
10551055
++li;
10561056
}
1057-
bindTextParameter(param_select,":type",a.type,FALSE);
1058-
bindTextParameter(param_insert,":type",a.type,FALSE);
1057+
bindTextParameter(param_select,":type",a.type);
1058+
bindTextParameter(param_insert,":type",a.type);
10591059
}
10601060
if (!a.name.isEmpty())
10611061
{
1062-
bindTextParameter(param_select,":declname",a.name,FALSE);
1063-
bindTextParameter(param_insert,":declname",a.name,FALSE);
1062+
bindTextParameter(param_select,":declname",a.name);
1063+
bindTextParameter(param_insert,":declname",a.name);
10641064
}
10651065
if (defArg && !defArg->name.isEmpty() && defArg->name!=a.name)
10661066
{
1067-
bindTextParameter(param_select,":defname",defArg->name,FALSE);
1068-
bindTextParameter(param_insert,":defname",defArg->name,FALSE);
1067+
bindTextParameter(param_select,":defname",defArg->name);
1068+
bindTextParameter(param_insert,":defname",defArg->name);
10691069
}
10701070
if (!a.array.isEmpty())
10711071
{
1072-
bindTextParameter(param_select,":array",a.array,FALSE);
1073-
bindTextParameter(param_insert,":array",a.array,FALSE);
1072+
bindTextParameter(param_select,":array",a.array);
1073+
bindTextParameter(param_insert,":array",a.array);
10741074
}
10751075
if (!a.defval.isEmpty())
10761076
{
10771077
StringList l;
10781078
linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a.defval);
1079-
bindTextParameter(param_select,":defval",a.defval,FALSE);
1080-
bindTextParameter(param_insert,":defval",a.defval,FALSE);
1079+
bindTextParameter(param_select,":defval",a.defval);
1080+
bindTextParameter(param_insert,":defval",a.defval);
10811081
}
10821082

10831083
int param_id=step(param_select,TRUE,TRUE);
@@ -1107,7 +1107,7 @@ static void insertMemberDefineParams(int memberdef_id,const MemberDef *md, const
11071107
{
11081108
for (const Argument &a : md->argumentList())
11091109
{
1110-
bindTextParameter(param_insert,":defname",a.type,FALSE);
1110+
bindTextParameter(param_insert,":defname",a.type);
11111111
int param_id=step(param_insert,TRUE);
11121112
if (param_id==-1) {
11131113
continue;
@@ -1383,21 +1383,21 @@ static void writeTemplateArgumentList(const ArgumentList &al,
13831383
if (!a.type.isEmpty())
13841384
{
13851385
//#warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.type);
1386-
bindTextParameter(param_select,":type",a.type,FALSE);
1387-
bindTextParameter(param_insert,":type",a.type,FALSE);
1386+
bindTextParameter(param_select,":type",a.type);
1387+
bindTextParameter(param_insert,":type",a.type);
13881388
}
13891389
if (!a.name.isEmpty())
13901390
{
1391-
bindTextParameter(param_select,":declname",a.name,FALSE);
1392-
bindTextParameter(param_insert,":declname",a.name,FALSE);
1393-
bindTextParameter(param_select,":defname",a.name,FALSE);
1394-
bindTextParameter(param_insert,":defname",a.name,FALSE);
1391+
bindTextParameter(param_select,":declname",a.name);
1392+
bindTextParameter(param_insert,":declname",a.name);
1393+
bindTextParameter(param_select,":defname",a.name);
1394+
bindTextParameter(param_insert,":defname",a.name);
13951395
}
13961396
if (!a.defval.isEmpty())
13971397
{
13981398
//#warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.defval);
1399-
bindTextParameter(param_select,":defval",a.defval,FALSE);
1400-
bindTextParameter(param_insert,":defval",a.defval,FALSE);
1399+
bindTextParameter(param_select,":defval",a.defval);
1400+
bindTextParameter(param_insert,":defval",a.defval);
14011401
}
14021402
if (!step(param_select,TRUE,TRUE))
14031403
step(param_insert);
@@ -1452,8 +1452,7 @@ static void getSQLDesc(SqlStmt &s,const char *col,const char *value,const Defini
14521452
value,
14531453
def->docFile(),
14541454
def->docLine()
1455-
),
1456-
FALSE
1455+
)
14571456
);
14581457
}
14591458
////////////////////////////////////////////
@@ -1646,7 +1645,7 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
16461645
}
16471646

16481647
bindIntParameter(memberdef_insert,":rowid", refid.rowid);
1649-
bindTextParameter(memberdef_insert,":kind",md->memberTypeName(),FALSE);
1648+
bindTextParameter(memberdef_insert,":kind",md->memberTypeName());
16501649
bindIntParameter(memberdef_insert,":prot",md->protection());
16511650

16521651
bindIntParameter(memberdef_insert,":static",md->isStatic());
@@ -1699,7 +1698,7 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
16991698
{
17001699
QCString bitfield = md->bitfieldString();
17011700
if (bitfield.at(0)==':') bitfield=bitfield.mid(1);
1702-
bindTextParameter(memberdef_insert,":bitfield",bitfield.stripWhiteSpace(),FALSE);
1701+
bindTextParameter(memberdef_insert,":bitfield",bitfield.stripWhiteSpace());
17031702
}
17041703
}
17051704
else if (md->memberType() == MemberType_Property)
@@ -1725,8 +1724,8 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
17251724

17261725
bindIntParameter(memberdef_insert,":accessor",accessor);
17271726
}
1728-
bindTextParameter(memberdef_insert,":read",md->getReadAccessor(),FALSE);
1729-
bindTextParameter(memberdef_insert,":write",md->getWriteAccessor(),FALSE);
1727+
bindTextParameter(memberdef_insert,":read",md->getReadAccessor());
1728+
bindTextParameter(memberdef_insert,":write",md->getWriteAccessor());
17301729
}
17311730
else if (md->memberType() == MemberType_Event)
17321731
{
@@ -1762,26 +1761,26 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
17621761
linkifyText(TextGeneratorSqlite3Impl(l), def, md->getBodyDef(),md,typeStr);
17631762
if (typeStr)
17641763
{
1765-
bindTextParameter(memberdef_insert,":type",typeStr,FALSE);
1764+
bindTextParameter(memberdef_insert,":type",typeStr);
17661765
}
17671766

17681767
if (md->definition())
17691768
{
1770-
bindTextParameter(memberdef_insert,":definition",md->definition(),FALSE);
1769+
bindTextParameter(memberdef_insert,":definition",md->definition());
17711770
}
17721771

17731772
if (md->argsString())
17741773
{
1775-
bindTextParameter(memberdef_insert,":argsstring",md->argsString(),FALSE);
1774+
bindTextParameter(memberdef_insert,":argsstring",md->argsString());
17761775
}
17771776
}
17781777

1779-
bindTextParameter(memberdef_insert,":name",md->name(),FALSE);
1778+
bindTextParameter(memberdef_insert,":name",md->name());
17801779

17811780
// Extract references from initializer
17821781
if (md->hasMultiLineInitializer() || md->hasOneLineInitializer())
17831782
{
1784-
bindTextParameter(memberdef_insert,":initializer",md->initializer(),FALSE);
1783+
bindTextParameter(memberdef_insert,":initializer",md->initializer());
17851784

17861785
StringList l;
17871786
linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,md->initializer());
@@ -1807,7 +1806,7 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
18071806

18081807
if ( md->getScopeString() )
18091808
{
1810-
bindTextParameter(memberdef_insert,":scope",md->getScopeString(),FALSE);
1809+
bindTextParameter(memberdef_insert,":scope",md->getScopeString());
18111810
}
18121811

18131812
// +Brief, detailed and inbody description
@@ -1951,9 +1950,9 @@ static void generateSqlite3ForClass(const ClassDef *cd)
19511950

19521951
bindIntParameter(compounddef_insert,":rowid", refid.rowid);
19531952

1954-
bindTextParameter(compounddef_insert,":name",cd->name(),FALSE);
1955-
bindTextParameter(compounddef_insert,":title",cd->title(), FALSE);
1956-
bindTextParameter(compounddef_insert,":kind",cd->compoundTypeString(),FALSE);
1953+
bindTextParameter(compounddef_insert,":name",cd->name());
1954+
bindTextParameter(compounddef_insert,":title",cd->title());
1955+
bindTextParameter(compounddef_insert,":kind",cd->compoundTypeString());
19571956
bindIntParameter(compounddef_insert,":prot",cd->protection());
19581957

19591958
int file_id = insertPath(cd->getDefFileName());
@@ -2098,9 +2097,9 @@ static void generateSqlite3ForNamespace(const NamespaceDef *nd)
20982097
if(!refid.created && compounddefExists(refid)){return;}
20992098
bindIntParameter(compounddef_insert,":rowid", refid.rowid);
21002099

2101-
bindTextParameter(compounddef_insert,":name",nd->name(),FALSE);
2102-
bindTextParameter(compounddef_insert,":title",nd->title(), FALSE);
2103-
bindTextParameter(compounddef_insert,":kind","namespace",FALSE);
2100+
bindTextParameter(compounddef_insert,":name",nd->name());
2101+
bindTextParameter(compounddef_insert,":title",nd->title());
2102+
bindTextParameter(compounddef_insert,":kind","namespace");
21042103

21052104
int file_id = insertPath(nd->getDefFileName());
21062105
bindIntParameter(compounddef_insert,":file_id",file_id);
@@ -2165,9 +2164,9 @@ static void generateSqlite3ForFile(const FileDef *fd)
21652164
if(!refid.created && compounddefExists(refid)){return;}
21662165
bindIntParameter(compounddef_insert,":rowid", refid.rowid);
21672166

2168-
bindTextParameter(compounddef_insert,":name",fd->name(),FALSE);
2169-
bindTextParameter(compounddef_insert,":title",fd->title(),FALSE);
2170-
bindTextParameter(compounddef_insert,":kind","file",FALSE);
2167+
bindTextParameter(compounddef_insert,":name",fd->name());
2168+
bindTextParameter(compounddef_insert,":title",fd->title());
2169+
bindTextParameter(compounddef_insert,":kind","file");
21712170

21722171
int file_id = insertPath(fd->getDefFileName());
21732172
bindIntParameter(compounddef_insert,":file_id",file_id);
@@ -2332,9 +2331,9 @@ static void generateSqlite3ForGroup(const GroupDef *gd)
23322331
if(!refid.created && compounddefExists(refid)){return;}
23332332
bindIntParameter(compounddef_insert,":rowid", refid.rowid);
23342333

2335-
bindTextParameter(compounddef_insert,":name",gd->name(),FALSE);
2336-
bindTextParameter(compounddef_insert,":title",gd->groupTitle(), FALSE);
2337-
bindTextParameter(compounddef_insert,":kind","group",FALSE);
2334+
bindTextParameter(compounddef_insert,":name",gd->name());
2335+
bindTextParameter(compounddef_insert,":title",gd->groupTitle());
2336+
bindTextParameter(compounddef_insert,":kind","group");
23382337

23392338
int file_id = insertPath(gd->getDefFileName());
23402339
bindIntParameter(compounddef_insert,":file_id",file_id);
@@ -2399,8 +2398,8 @@ static void generateSqlite3ForDir(const DirDef *dd)
23992398
if(!refid.created && compounddefExists(refid)){return;}
24002399
bindIntParameter(compounddef_insert,":rowid", refid.rowid);
24012400

2402-
bindTextParameter(compounddef_insert,":name",dd->displayName(),FALSE);
2403-
bindTextParameter(compounddef_insert,":kind","dir",FALSE);
2401+
bindTextParameter(compounddef_insert,":name",dd->displayName());
2402+
bindTextParameter(compounddef_insert,":kind","dir");
24042403

24052404
int file_id = insertPath(dd->getDefFileName(),TRUE,TRUE,2);
24062405
bindIntParameter(compounddef_insert,":file_id",file_id);
@@ -2457,7 +2456,7 @@ static void generateSqlite3ForPage(const PageDef *pd,bool isExample)
24572456

24582457
bindIntParameter(compounddef_insert,":rowid",refid.rowid);
24592458
// + name
2460-
bindTextParameter(compounddef_insert,":name",pd->name(),FALSE);
2459+
bindTextParameter(compounddef_insert,":name",pd->name());
24612460

24622461
QCString title;
24632462
if (pd==Doxygen::mainPage) // main page is special
@@ -2483,9 +2482,9 @@ static void generateSqlite3ForPage(const PageDef *pd,bool isExample)
24832482
}
24842483

24852484
// + title
2486-
bindTextParameter(compounddef_insert,":title",title,FALSE);
2485+
bindTextParameter(compounddef_insert,":title",title);
24872486

2488-
bindTextParameter(compounddef_insert,":kind", isExample ? "example" : "page");
2487+
bindTextParameter(compounddef_insert,":kind", isExample ? "example" : "page",TRUE);
24892488

24902489
int file_id = insertPath(pd->getDefFileName());
24912490

0 commit comments

Comments
 (0)