j3g
/
dbfp_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: parsing of PRIMARY KEY (field_name_111, field_name_222)

This commit is contained in:
JohnE 2015-09-17 02:50:01 -07:00
parent 82bf211e4c
commit 82651d5388
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/fingerprint.py
View File

@ -32,8 +32,8 @@ class DBSchema:
""" """
sqlmaster = "SELECT name, sql FROM sqlite_master WHERE type='table'" sqlmaster = "SELECT name, sql FROM sqlite_master WHERE type='table'"
scanner_ver = ".85" scanner_ver = "0.85"
format_ver = ".90" format_ver = "0.90"
def __init__(self): def __init__(self):
self.conn = None self.conn = None
@ -296,8 +296,6 @@ class TableDefinition:
if newField: if newField:
self.fields[newField['name']] = newField self.fields[newField['name']] = newField
del newField['name'] del newField['name']
else:
print "WARN: <{}> ] failed to parse]".format(tableName)
# #
def importTable(self, tbName, sqlStr, fields): def importTable(self, tbName, sqlStr, fields):
@ -391,10 +389,10 @@ class TableDefinition:
newField['datatype'] = results.group(2) newField['datatype'] = results.group(2)
return newField return newField
# field_name) # field_name)
results = re.match(r'(?:[`|\"|\'])*(\w+)(?:[`|\"|\'])*(\)?)', sqltext) # results = re.match(r'(?:[`|\"|\'])*(\w+)(?:[`|\"|\'])*(\)?)', sqltext)
results = re.match(r'(?:[`|\"|\'])*(\w+)(?:[`|\"|\'])*\)', sqltext)
if results: if results:
field = self.fields[results.group(1)] field = self.fields[results.group(1)]
field = self.fields[results.group(2)]
if (self.primarykeyFlag): if (self.primarykeyFlag):
field['primarykey'] = True field['primarykey'] = True
if (field): if (field):
@ -408,6 +406,7 @@ class TableDefinition:
print 'WARN: field definition not recognized: "{}"'.format(sqltext) print 'WARN: field definition not recognized: "{}"'.format(sqltext)
except Exception, e: except Exception, e:
print 'WARN: problem parsing sql create text: "{}"'.format(sqltext) print 'WARN: problem parsing sql create text: "{}"'.format(sqltext)
print 'Exception: \n{}'.format(e)
return None return None
return None return None