Merge branch 'master' of git://git.assembla.com/fpdboz

This commit is contained in:
Eratosthenes 2010-02-01 10:47:35 -05:00
commit 03967fc227

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sqlite3 import sqlite3
import fpdb_db import Database
import math import math
# Should probably use our wrapper classes - creating sqlite db in memory # Should probably use our wrapper classes - creating sqlite db in memory
@ -14,11 +14,11 @@ con.isolation_level = None
con.create_function("floor", 1, math.floor) con.create_function("floor", 1, math.floor)
#Mod function #Mod function
tmp = fpdb_db.sqlitemath() tmp = Database.sqlitemath()
con.create_function("mod", 2, tmp.mod) con.create_function("mod", 2, tmp.mod)
# Aggregate function VARIANCE() # Aggregate function VARIANCE()
con.create_aggregate("variance", 1, fpdb_db.VARIANCE) con.create_aggregate("variance", 1, Database.VARIANCE)
cur = con.cursor() cur = con.cursor()