equal
deleted
inserted
replaced
10 #include "../include/relpipe/reader/RelationalReader.h" |
10 #include "../include/relpipe/reader/RelationalReader.h" |
11 #include "../include/relpipe/reader/TypeId.h" |
11 #include "../include/relpipe/reader/TypeId.h" |
12 #include "../include/relpipe/reader/handlers/RelationalReaderBaseHandler.h" |
12 #include "../include/relpipe/reader/handlers/RelationalReaderBaseHandler.h" |
13 #include "../include/relpipe/reader/handlers/RelationalReaderStringHandler.h" |
13 #include "../include/relpipe/reader/handlers/RelationalReaderStringHandler.h" |
14 #include "../include/relpipe/reader/handlers/RelationalReaderValueHandler.h" |
14 #include "../include/relpipe/reader/handlers/RelationalReaderValueHandler.h" |
|
15 #include "AttributeMetadataPrivate.h" |
15 #include "DataTypeReaderBase.h" |
16 #include "DataTypeReaderBase.h" |
16 #include "types/BooleanDataTypeReader.h" |
17 #include "types/BooleanDataTypeReader.h" |
17 #include "types/IntegerDataTypeReader.h" |
18 #include "types/IntegerDataTypeReader.h" |
18 #include "types/StringDataTypeReader.h" |
19 #include "types/StringDataTypeReader.h" |
19 |
20 |
155 TypeId typeId = (TypeId) integerReader.readValue(input); // TODO: přetypování OK? |
156 TypeId typeId = (TypeId) integerReader.readValue(input); // TODO: přetypování OK? |
156 string_t typeCode = toTypeCode(typeId); // validate typeId TODO: je potřeba? |
157 string_t typeCode = toTypeCode(typeId); // validate typeId TODO: je potřeba? |
157 columnTypes[i] = typeId; |
158 columnTypes[i] = typeId; |
158 |
159 |
159 // put together names, type ids and type codes: |
160 // put together names, type ids and type codes: |
160 columns[i] = {columnNames[i], columnTypes[i], typeCode}; |
161 handlers::AttributeMetadataPrivate* xxx = new handlers::AttributeMetadataPrivate({columnNames[i], columnTypes[i], typeCode}); |
|
162 columns[i] = handlers::AttributeMetadata(xxx); |
161 } |
163 } |
162 |
164 |
163 for (StringHandler* handler : stringHandlers) handler->startRelation(tableName, columns); |
165 for (StringHandler* handler : stringHandlers) handler->startRelation(tableName, columns); |
164 for (ValuesHandler* handler : valuesHandlers) handler->startRelation(tableName, columns); |
166 for (ValuesHandler* handler : valuesHandlers) handler->startRelation(tableName, columns); |
165 |
167 |