Skip to content
This repository was archived by the owner on Mar 18, 2021. It is now read-only.

Feat/improve UUID varchar dataypes #4

Open
jackbravo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feat/improve UUID varchar dataypes #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482360e
feat: varchar types can be written without length parameter
jackbravo Jul 4, 2020
58801d5
feat: make uuid types use a count hexadecimal generator, that way the…
jackbravo Jul 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions datafiller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2389,7 +2389,7 @@ RE_SER=r'(SMALL|BIG)?SERIAL|SERIAL[248]'
RE_BLO=r'BYTEA|BLOB'
RE_INT=r'{0}|(TINY|SMALL|MEDIUM)INT|INT[248]|INTEGER|INT\b'.format(RE_SER)
RE_FLT=r'REAL|FLOAT|DOUBLE\s+PRECISION|NUMERIC|DECIMAL'
RE_TXT=r'TEXT|CHAR\(\d+\)|VARCHAR\(\d+\)'
RE_TXT=r'TEXT|CHAR\(\d+\)|VARCHAR(\(\d+\))?'
RE_BIT=r'BIT\(\d+\)|VARBIT\(\d+\)'
RE_TSTZ=r'TIMESTAMP(\s+WITH\s+TIME\s+ZONE)?'
RE_INTV=r'INTERVAL'
Expand Down Expand Up @@ -3979,8 +3979,8 @@ class BitGenerator(WithLength, RandomGenerator):
def UUIDGenerator(att, params=None):
if not params:
params = att.params
params['pattern'] = r'\h{4}(\h{4}-){4}\h{12}'
return PatternGenerator(att, params)
params['format'] = '032X'
return CountGenerator(att, params)

# all user-visible generators
GENERATORS = {
Expand Down Expand Up @@ -4370,8 +4370,7 @@ class Database(object):
t = type.lower()
return t == 'smallint' or t == 'int' or t == 'integer' or t == 'bigint'
def textType(self, type):
t = type.lower()
return t == 'text' or re.match(r'(var)?char\(', t)
return re.match(RE_TXT + '$', type, re.I)
def boolType(self, type):
t = type.lower()
return t == 'bool' or t == 'boolean'
Expand Down