Skip to content

Commit f360f39

Browse files
author
Artyom Abakumov
committed
Rename putDtype to putType with dsql_fld* overload
1 parent e1da005 commit f360f39

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

‎src/dsql/DsqlCompilerScratch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ void DsqlCompilerScratch::putBlrMarkers(ULONG marks)
238238

239239
// Write out field data type.
240240
// Taking special care to declare international text.
241-
void DsqlCompilerScratch::putDtype(const TypeClause* field, bool useSubType)
241+
void DsqlCompilerScratch::putType(const dsql_fld* field, bool useSubType)
242242
{
243243
fb_assert(field);
244244
putType(*field, useSubType, field->explicitCollation);

‎src/dsql/DsqlCompilerScratch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class DsqlCompilerScratch : public BlrDebugWriter
170170
std::initializer_list<ObjectType> objectTypes);
171171

172172
void putBlrMarkers(ULONG marks);
173-
void putDtype(const TypeClause* field, bool useSubType);
173+
void putType(const dsql_fld* field, bool useSubType);
174174

175175
// * Generate TypeClause blr and put it to this Scratch
176176
// Depends on: typeOfName, typeOfTable and schema:

‎src/dsql/ExprNodes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3604,7 +3604,7 @@ void CastNode::genBlr(DsqlCompilerScratch* dsqlScratch)
36043604
else
36053605
dsqlScratch->appendUChar(blr_cast);
36063606

3607-
dsqlScratch->putDtype(dsqlField, true);
3607+
dsqlScratch->putType(dsqlField, true);
36083608

36093609
GEN_expr(dsqlScratch, source);
36103610
}

‎src/jrd/RecordSourceNodes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4168,7 +4168,7 @@ void TableValueFunctionSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
41684168

41694169
for (const auto& fld : arrayFld)
41704170
{
4171-
dsqlScratch->putDtype(fld, true);
4171+
dsqlScratch->putType(fld, true);
41724172
dsqlScratch->appendMetaString(fld->fld_name.c_str());
41734173
}
41744174
}

‎src/jrd/tests/BlrGenTest.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(TestDefaultTextField)
7676
Jrd::TypeClause field = genDefaultFiled(pool);
7777

7878
DsqlCompilerScratch& scratch = *makeScratch();
79-
scratch.putDtype(&field, true);
79+
scratch.putType(&field, true);
8080

8181
DsqlCompilerScratch& expected = *makeScratch();
8282
genDomainFiled(expected, blr_domain_full);
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(TestDefaultTextFieldSameSchema)
9898

9999
DsqlCompilerScratch& scratch = *makeScratch();
100100
scratch.ddlSchema = field.typeOfTable.schema;
101-
scratch.putDtype(&field, true);
101+
scratch.putType(&field, true);
102102

103103
DsqlCompilerScratch& expected = *makeScratch();
104104
expected.appendUChar(blr_column_name2);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(TestFalseDomain)
126126
field.fullDomain = false;
127127

128128
DsqlCompilerScratch& scratch = *makeScratch();
129-
scratch.putDtype(&field, true);
129+
scratch.putType(&field, true);
130130

131131
DsqlCompilerScratch& expected = *makeScratch();
132132
genDomainFiled(expected, blr_domain_type_of);
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(TestFalseDomain)
143143
field.fullDomain = false;
144144

145145
DsqlCompilerScratch& scratch = *makeScratch();
146-
scratch.putDtype(&field, true);
146+
scratch.putType(&field, true);
147147

148148
DsqlCompilerScratch& expected = *makeScratch();
149149
expected.appendUChar(blr_column_name3);
@@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE(TestUseSubType)
173173
DsqlCompilerScratch& scratch = *makeScratch();
174174
Jrd::TypeClause field = genDefaultFiled(pool);
175175
field.typeOfName.clear();
176-
scratch.putDtype(&field, true);
176+
scratch.putType(&field, true);
177177

178178
DsqlCompilerScratch& expected = *makeScratch();
179179
expected.appendUChar(blr_text2);
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(TestUseSubType)
190190
DsqlCompilerScratch& scratch = *makeScratch();
191191
Jrd::TypeClause field = genDefaultFiled(pool);
192192
field.typeOfName.clear();
193-
scratch.putDtype(&field, false);
193+
scratch.putType(&field, false);
194194

195195
DsqlCompilerScratch& expected = *makeScratch();
196196
expected.appendUChar(blr_text);
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(TestFalseExplicitCollation)
216216

217217
Jrd::TypeClause field = genDefaultFiled(pool);
218218
field.explicitCollation = false;
219-
scratch.putDtype(&field, true);
219+
scratch.putType(&field, true);
220220

221221
DsqlCompilerScratch& expected = *makeScratch();
222222
expected.appendUChar(blr_column_name3);
@@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE(TestFalseExplicitCollation)
239239
field.explicitCollation = false;
240240
scratch.ddlSchema = field.typeOfTable.schema;
241241

242-
scratch.putDtype(&field, true);
242+
scratch.putType(&field, true);
243243

244244
DsqlCompilerScratch& expected = *makeScratch();
245245
expected.appendUChar(blr_column_name);
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(TestEmptyTypeOfTable)
292292
DsqlCompilerScratch& scratch = *makeScratch();
293293
Jrd::TypeClause field = genDefaultFiled(pool);
294294
field.typeOfTable.clear();
295-
scratch.putDtype(&field, true);
295+
scratch.putType(&field, true);
296296

297297
DsqlCompilerScratch& expected = *makeScratch();
298298
expected.appendUChar(blr_domain_name3);
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(TestEmptyTypeOfTable)
315315
field.typeOfTable.clear();
316316

317317
scratch.ddlSchema = field.typeOfName.schema;
318-
scratch.putDtype(&field, true);
318+
scratch.putType(&field, true);
319319

320320
DsqlCompilerScratch& expected = *makeScratch();
321321
expected.appendUChar(blr_domain_name2);

0 commit comments

Comments
 (0)