Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Postgresql and Mysql limit/offset

Browse Source
This commit is contained in:
Doug Blank 2016-04-23 17:00:11 -04:00
parent 3ccc3a3512
commit 5cfb8b1e17
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/plugins/database/dbapi.py
View File

@ -1859,7 +1859,7 @@ class DBAPI(DbGeneric):
if get_count_only: if get_count_only:
select_fields = ["1"] select_fields = ["1"]
if start: if start:
query = "SELECT %s FROM %s %s %s LIMIT %s, %s" % ( query = "SELECT %s FROM %s %s %s LIMIT %s, %s " % (
", ".join(select_fields), table_name, where_clause, order_clause, start, limit ", ".join(select_fields), table_name, where_clause, order_clause, start, limit
) )
else: else:

11
gramps/plugins/database/dbapi_support/mysql.py
View File

@ -1,4 +1,5 @@
import MySQLdb import MySQLdb
import re
MySQLdb.paramstyle = 'qmark' ## Doesn't work MySQLdb.paramstyle = 'qmark' ## Doesn't work
@ -36,8 +37,14 @@ class MySQL(object):
## LIMIT offset, -1 ## LIMIT offset, -1
query = query.replace("LIMIT -1", query = query.replace("LIMIT -1",
"LIMIT 18446744073709551615") ## "LIMIT 18446744073709551615") ##
## FIXME: regex match: match = re.match(".* LIMIT (.*), (.*) ", query)
#query = query.replace("LIMIT .*,-1", "LIMIT $1, ALL") if match and match.groups():
offset, count = match.groups()
if count == "-1":
count = "18446744073709551615"
query = re.sub("(.*) LIMIT (.*), (.*) ",
"\\1 LIMIT %s, %s " % (offset, count),
query)
return query return query
def execute(self, query, args=[]): def execute(self, query, args=[]):

32
gramps/plugins/database/dbapi_support/postgresql.py
View File

@ -1,4 +1,5 @@
import psycopg2 import psycopg2
import re
psycopg2.paramstyle = 'format' psycopg2.paramstyle = 'format'
@ -23,13 +24,28 @@ class Postgresql(object):
self.connection.autocommit = True self.connection.autocommit = True
self.cursor = self.connection.cursor() self.cursor = self.connection.cursor()
def _hack_query(self, query):
query = query.replace("?", "%s")
query = query.replace("REGEXP", "~")
query = query.replace("desc", "desc_")
## LIMIT offset, count
## count can be -1, for all
## LIMIT -1
## LIMIT offset, -1
query = query.replace("LIMIT -1",
"LIMIT all") ##
match = re.match(".* LIMIT (.*), (.*) ", query)
if match and match.groups():
offset, count = match.groups()
if count == "-1":
count = "all"
query = re.sub("(.*) LIMIT (.*), (.*) ",
"\\1 LIMIT %s OFFSET %s " % (count, offset),
query)
return query
def execute(self, *args, **kwargs): def execute(self, *args, **kwargs):
sql = args[0] sql = self._hack_query(args[0])
sql = sql.replace("?", "%s")
sql = sql.replace("REGEXP", "~")
sql = sql.replace("desc", "desc_")
sql = sql.replace("LIMIT -1", "LIMIT all")
## FIXME: limit offset, -1
if len(args) > 1: if len(args) > 1:
args = args[1] args = args[1]
else: else:
@ -56,10 +72,8 @@ class Postgresql(object):
self.connection.rollback() self.connection.rollback()
def try_execute(self, sql): def try_execute(self, sql):
sql = sql.replace("?", "%s") sql = self._hack_query(sql)
sql = sql.replace("BLOB", "bytea") sql = sql.replace("BLOB", "bytea")
sql = sql.replace("desc", "desc_")
sql = sql.replace("LIMIT -1", "LIMIT all")
try: try:
self.cursor.execute(sql) self.cursor.execute(sql)
except Exception as exc: except Exception as exc: