From 9076971d751983434f8fd813cf5323c90cfbdc75 Mon Sep 17 00:00:00 2001 From: ilvalle Date: Fri, 17 Oct 2014 17:56:54 +0200 Subject: [PATCH] renamed postgre.py into postgres.py, removed starts/ends with overriding in PG adapter --- gluon/dal/adapters/__init__.py | 2 +- gluon/dal/adapters/{postgre.py => postgres.py} | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) rename gluon/dal/adapters/{postgre.py => postgres.py} (97%) diff --git a/gluon/dal/adapters/__init__.py b/gluon/dal/adapters/__init__.py index 4bad5bc8..54927648 100644 --- a/gluon/dal/adapters/__init__.py +++ b/gluon/dal/adapters/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from .sqlite import SQLiteAdapter, SpatiaLiteAdapter, JDBCSQLiteAdapter from .mysql import MySQLAdapter -from .postgre import PostgreSQLAdapter, NewPostgreSQLAdapter, JDBCPostgreSQLAdapter +from .postgres import PostgreSQLAdapter, NewPostgreSQLAdapter, JDBCPostgreSQLAdapter from .oracle import OracleAdapter from .mssql import MSSQLAdapter, MSSQL2Adapter, MSSQL3Adapter, MSSQL4Adapter, \ VerticaAdapter, SybaseAdapter diff --git a/gluon/dal/adapters/postgre.py b/gluon/dal/adapters/postgres.py similarity index 97% rename from gluon/dal/adapters/postgre.py rename to gluon/dal/adapters/postgres.py index c675f39e..e997949b 100644 --- a/gluon/dal/adapters/postgre.py +++ b/gluon/dal/adapters/postgres.py @@ -211,14 +211,6 @@ class PostgreSQLAdapter(BaseAdapter): return '(%s ~ %s)' % (self.expand(first), 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 def ST_ASGEOJSON(self, first, second):