Substring in new DAL

[rfx_labs]

Hi Massimo,

this doesn't work any more:
nw.ekartikel.Name[4:]

File "/PATH/web2py/gluon/sql.py", line 2742, in __getslice__
s = self._db._adapter.SUBSTRING(d)
TypeError: SUBSTRING() takes exactly 4 arguments (2 given)


Martin

[rfx_labs]

this is the patch for this:

@@ -151,7 +151,7 @@
return 'Random()'
def NOT_NULL(self,default):
return 'NOT NULL DEFAULT %s' % default
- def SUBSTRING(self,fieldname,pos,lenght):
+ def SUBSTRING(self,fieldname,pos,length):
return 'SUBSTR(%s,%s,%s)' % (fieldname, pos, length)
def PRIMARY_KEY(self,key):
return 'PRIMARY KEY(%s)' % key
@@ -386,7 +386,7 @@
}
def RANDOM(self):
return 'RAND()'
- def SUBSTRING(self,fieldname,pos,lenght):
+ def SUBSTRING(self,fieldname,pos,length):
return 'SUBSTRING(%s,%s,%s)' % (fieldname, pos, length)
def DROP(self,table,mode):
# breaks db integrity but without this mysql does not drop
table
@@ -605,7 +605,7 @@
return 'LEFT OUTER JOIN'
def RANDOM(self):
return 'NEWID()'
- def SUBSTRING(self,fieldname,pos,lenght):
+ def SUBSTRING(self,fieldname,pos,length):
return 'SUBSTRING(%s,%s,%s)' % (fieldname, pos, length)
def PRIMARY_KEY(self,key):
return 'PRIMARY KEY CLUSTERED (%s)' % key
@@ -731,7 +731,7 @@
return 'RAND()'
def NOT_NULL(self,default):
return 'DEFAULT %s NOT NULL', default
- def SUBSTRING(self,fieldname,pos,lenght):
+ def SUBSTRING(self,fieldname,pos,length):
return 'SUBSTRING(%s,%s,%s)' % (fieldname, pos, length)
def DROP(self,table,mode):
return ['DROP TABLE %s %s;' % (table, mode), 'DROP GENERATOR
GENID_%s;' % table]
@@ -2738,8 +2738,8 @@
def __getslice__(self, start, stop):
if start < 0 or stop < start:
raise SyntaxError, 'not supported: %s - %s' % (start,
stop)
- d = dict(field=str(self), pos=start + 1, length=stop - start)
- s = self._db._adapter.SUBSTRING(d)
+ d = dict(fieldname=str(self), pos=start + 1, length=stop -
start)
+ s = self._db._adapter.SUBSTRING(**d)
return Expression(s, 'string', self._db)

def __getitem__(self, i):

[mdipierro]

thanks! uploading to trunk.

Massimo