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

improved regex matching

Browse Source
This commit is contained in:
Michele Comitini
2012-10-30 17:39:49 +01:00
parent c58c6157e9
commit 9f2e135e80
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/extract_sqlite_models.py
+3 -1
View File
@@ -84,7 +84,9 @@ def sqlite(database_name):
for line in sql_lines[1:-1]: 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(')'): if re.search('KEY', line) or re.search('PRIMARY', line) or re.search('"ID"', line) or line.startswith(')'):
continue continue
hit = re.search('"(\S+)"\s+(\S+)(,| )( .*)?', line) print line
hit = re.search(r'"(\S+)"\s+(\w+(\(\S+\))?),?( .*)?', line)
print hit and hit.groups()
if hit is not None: if hit is not None:
name, d_type = hit.group(1), hit.group(2) name, d_type = hit.group(1), hit.group(2)
d_type = re.sub(r'(\w+)\(.*', r'\1', d_type) d_type = re.sub(r'(\w+)\(.*', r'\1', d_type)