equal
deleted
inserted
replaced
38 dsn = TextLine(title=_('DSN'), |
38 dsn = TextLine(title=_('DSN'), |
39 description=_('RFC-1738 compliant URL for the database connection'), |
39 description=_('RFC-1738 compliant URL for the database connection'), |
40 required=True, |
40 required=True, |
41 default=u'sqlite://') |
41 default=u'sqlite://') |
42 |
42 |
43 echo = Bool(title=_('Echo SQL'), |
43 echo = Bool(title=_('Echo SQL?'), |
|
44 description=_("Log all SQL statements to system logger"), |
44 required=True, |
45 required=True, |
45 default=False) |
46 default=False) |
|
47 |
|
48 use_pool = Bool(title=_("Use connections pool?"), |
|
49 description=_("If 'no', collections pooling will be disabled"), |
|
50 required=True, |
|
51 default=True) |
46 |
52 |
47 pool_size = Int(title=_("Pool size"), |
53 pool_size = Int(title=_("Pool size"), |
48 description=_("SQLAlchemy connections pool size"), |
54 description=_("SQLAlchemy connections pool size"), |
49 required=False, |
55 required=False, |
50 default=25) |
56 default=25) |
52 pool_recycle = Int(title=_("Pool recycle time"), |
58 pool_recycle = Int(title=_("Pool recycle time"), |
53 description=_("SQLAlchemy connection recycle time (-1 for none)"), |
59 description=_("SQLAlchemy connection recycle time (-1 for none)"), |
54 required=False, |
60 required=False, |
55 default=-1) |
61 default=-1) |
56 |
62 |
|
63 echo_pool = Bool(title=_("Echo pool?"), |
|
64 description=_("Log all pool checkouts/checkins to system logger?"), |
|
65 required=True, |
|
66 default=False) |
|
67 |
57 encoding = Choice(title=_('Encoding'), |
68 encoding = Choice(title=_('Encoding'), |
58 required=True, |
69 required=True, |
59 vocabulary='PyAMS encodings', |
70 vocabulary='PyAMS encodings', |
60 default='utf-8') |
71 default='utf-8') |
61 |
72 |
62 convert_unicode = Bool(title=_('Convert Unicode'), |
73 convert_unicode = Bool(title=_('Convert Unicode'), |
63 required=True, |
74 required=True, |
64 default=False) |
75 default=False) |
65 |
76 |
66 def get_engine(self): |
77 def get_engine(self, use_pool=True): |
67 """Get SQLAlchemy engine""" |
78 """Get SQLAlchemy engine""" |