0
0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00

Merge branch 'develop' of https://github.com/rbock/sqlpp11 into develop

This commit is contained in:
rbock 2017-01-07 10:56:55 +01:00
commit d1a3222d56

View File

@ -233,6 +233,7 @@ else:
if warnOnParse: if warnOnParse:
print(parseError + '. Continuing [-no-warn-on-parse]') print(parseError + '. Continuing [-no-warn-on-parse]')
nsList = namespace.split('::')
# PROCESS DDL # PROCESS DDL
tableCreations = ddl.parseFile(pathToDdl) tableCreations = ddl.parseFile(pathToDdl)
@ -246,8 +247,9 @@ print('#include <' + INCLUDE + '/table.h>', file=header)
print('#include <' + INCLUDE + '/data_types.h>', file=header) print('#include <' + INCLUDE + '/data_types.h>', file=header)
print('#include <' + INCLUDE + '/char_sequence.h>', file=header) print('#include <' + INCLUDE + '/char_sequence.h>', file=header)
print('', file=header) print('', file=header)
print('namespace ' + namespace, file=header) for ns in nsList:
print('{', file=header) print('namespace ' + ns, file=header)
print('{', file=header)
DataTypeError = False DataTypeError = False
for create in tableCreations: for create in tableCreations:
sqlTableName = create.tableName sqlTableName = create.tableName
@ -322,7 +324,8 @@ for create in tableCreations:
print(' };', file=header) print(' };', file=header)
print(' };', file=header) print(' };', file=header)
print('}', file=header) for ns in nsList:
print('} // namespace ' + ns, file=header)
print('#endif', file=header) print('#endif', file=header)
if (DataTypeError): if (DataTypeError):
print("Error: unsupported datatypes." ) print("Error: unsupported datatypes." )