dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #807 from sven/master

Browse Source 
Make extract_sqlite_models.py work with SQLite 3.8.6
This commit is contained in:
mdipierro
2015-02-24 09:25:09 -06:00
parent 8d83bb3076 d7d00d1f45
commit a4f181ff8e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/extract_sqlite_models.py
+2 -2
View File
@@ -83,7 +83,7 @@ def sqlite(database_name):
for line in sql_lines[1:-1]:
if re.search('KEY', line) or re.search('PRIMARY', line) or re.search('"ID"', line) or line.startswith(')'):
continue
hit = re.search(r'"(\S+)"\s+(\w+(\(\S+\))?),?( .*)?', line)
hit = re.search(r'\[(\S+)\]\s+(\w+(\(\S+\))?),?( .*)?', line)
if hit is not None:
name, d_type = hit.group(1), hit.group(2)
d_type = re.sub(r'(\w+)\(.*', r'\1', d_type)
@@ -94,7 +94,7 @@ def sqlite(database_name):
else:
field_type = 'reference %s.%s' % (fks[name][0], fks[name][1])
else:
field_type = data_type_map[d_type]
field_type = data_type_map[d_type.lower()]
web2py_table_code += "\n Field('%s','%s')," % (
name, field_type)
web2py_table_code = "legacy_db.define_table('%s',%s\n migrate=False)" % (table_name, web2py_table_code)