From de2409dd7eeece942c8ed84d4bed8ede7d35e1fd Mon Sep 17 00:00:00 2001 From: strangeqargo <“strangeqargo@gmail.com”> Date: Sat, 14 May 2016 16:21:35 +0300 Subject: [PATCH] remove regression --- scripts/ddl2cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ddl2cpp b/scripts/ddl2cpp index ec26dd26..b77d895c 100755 --- a/scripts/ddl2cpp +++ b/scripts/ddl2cpp @@ -200,7 +200,7 @@ types = { 'set': 'text', # MYSQL } -ddlColumn = Group(Optional(ddlConstraint).setResultsName("isConstraint") + OneOrMore(MatchFirst([ddlNotNull, ddlAutoValue, ddlDefaultValue, ddlTerm, ddlNum, ddlColumnComment, ddlString, ddlArguments]))) +ddlColumn = Group(Optional(ddlConstraint).setResultsName("isConstraint") + OneOrMore(MatchFirst([ddlNotNull, ddlAutoValue, ddlDefaultValue, ddlFunctionWord("NOW"), ddlTerm, ddlNum, ddlColumnComment, ddlString, ddlArguments]))) createTable = Group(ddlWord("CREATE") + ddlWord("TABLE") + ddlName.setResultsName("tableName") + "(" + Group(delimitedList(ddlColumn)).setResultsName("columns") + ")").setResultsName("create") ddlComment = oneOf(["--", "#"]) + restOfLine