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

Fixed merge conflict

Browse Source
This commit is contained in:
gi0baro
2014-09-25 12:51:39 +02:00
parent 5c07c511fa
commit 502327e531
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tests/test_dal.py
+1 -2
View File
@@ -27,7 +27,6 @@ print 'Testing against %s engine (%s)' % (DEFAULT_URI.partition(':')[0], DEFAULT
from dal import DAL, Field from dal import DAL, Field
from dal.objects import Table from dal.objects import Table
from dal.helpers.classes import SQLALL from dal.helpers.classes import SQLALL
from dal import DAL, Field, Table, SQLALL
from gluon.cache import CacheInRam from gluon.cache import CacheInRam
ALLOWED_DATATYPES = [ ALLOWED_DATATYPES = [
@@ -1514,7 +1513,7 @@ class TestQuoting(unittest.TestCase):
class TestTableAndFieldCase(unittest.TestCase): class TestTableAndFieldCase(unittest.TestCase):
""" """
at the Python level we should not allow db.C and db.c because of .table conflicts on windows at the Python level we should not allow db.C and db.c because of .table conflicts on windows
but it should be possible to map two different names into distinct tables "c" and "C" at the Python level but it should be possible to map two different names into distinct tables "c" and "C" at the Python level
By default Python models names should be mapped into lower case table names and assume case insensitivity. By default Python models names should be mapped into lower case table names and assume case insensitivity.
""" """