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

Merge pull request #528 from ilvalle/pg_rename

Browse Source 
renamed postgre.py into postgres.py, removed 2 overriding PG
This commit is contained in:
mdipierro
2014-10-18 15:18:40 -05:00
parent 85a0e8f1b0 9076971d75
commit ba374dea2c
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal/adapters/__init__.py
+1 -1
View File
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from .sqlite import SQLiteAdapter, SpatiaLiteAdapter, JDBCSQLiteAdapter from .sqlite import SQLiteAdapter, SpatiaLiteAdapter, JDBCSQLiteAdapter
from .mysql import MySQLAdapter from .mysql import MySQLAdapter
from .postgre import PostgreSQLAdapter, NewPostgreSQLAdapter, JDBCPostgreSQLAdapter from .postgres import PostgreSQLAdapter, NewPostgreSQLAdapter, JDBCPostgreSQLAdapter
from .oracle import OracleAdapter from .oracle import OracleAdapter
from .mssql import MSSQLAdapter, MSSQL2Adapter, MSSQL3Adapter, MSSQL4Adapter, \ from .mssql import MSSQLAdapter, MSSQL2Adapter, MSSQL3Adapter, MSSQL4Adapter, \
VerticaAdapter, SybaseAdapter VerticaAdapter, SybaseAdapter
gluon/dal/adapters/postgre.py → gluon/dal/adapters/postgres.py
-8
View File
@@ -211,14 +211,6 @@ class PostgreSQLAdapter(BaseAdapter):
return '(%s ~ %s)' % (self.expand(first), return '(%s ~ %s)' % (self.expand(first),
self.expand(second,'string')) self.expand(second,'string'))
def STARTSWITH(self,first,second):
return '(%s LIKE %s)' % (self.expand(first),
self.expand(second+'%','string'))
def ENDSWITH(self,first,second):
return '(%s LIKE %s)' % (self.expand(first),
self.expand('%'+second,'string'))
# GIS functions # GIS functions
def ST_ASGEOJSON(self, first, second): def ST_ASGEOJSON(self, first, second):