github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 15:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved to SQLAlchemy 0.5

Browse Source
This commit is contained in:
Mike
2009-04-01 15:41:55 -07:00
parent 1be7d5e861
commit edde2622aa
7 changed files with 62 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/lib/db/alter_db.py
View File

@@ -50,7 +50,7 @@ def exec_all(command, data=False, rel = False, print_only = False):
for tt in tables:
#print tt
engine = tt.engine
engine = tt.bind
if print_only:
print command % dict(type=tt.name)
else:

52
r2/r2/lib/db/tdb_sql.py
View File

@@ -43,19 +43,19 @@ transactions = TransSet()
BigInteger = postgres.PGBigInteger
def make_metadata(engine):
metadata = sa.BoundMetaData(engine)
metadata.engine.echo = g.debug
metadata = sa.MetaData(engine)
metadata.bind.echo = g.debug
return metadata
def create_table(table, index_commands=None):
t = table
if g.db_create_tables:
#@@hackish?
if not t.engine.has_table(t.name):
if not t.bind.has_table(t.name):
t.create(checkfirst = False)
if index_commands:
for i in index_commands:
t.engine.execute(i)
t.bind.execute(i)
def index_str(table, name, on, where = None):
index_str = 'create index idx_%s_' % name
@@ -283,7 +283,7 @@ def get_read_table(tables):
#'t' is a list of engines itself. since we assume those engines
#are on the same machine, just take the first one. len(ips) may be
#< len(tables) if some tables are on the same host.
ips = dict((t[0].engine.url.host, t) for t in tables)
ips = dict((t[0].bind.url.host, t) for t in tables)
ip_loads = AppServiceMonitor.get_db_load(ips.keys())
candidates = []
@@ -341,7 +341,7 @@ def make_thing(type_id, ups, downs, date, deleted, spam, id=None):
params['thing_id'] = id
def do_insert(t):
transactions.add_engine(t.engine)
transactions.add_engine(t.bind)
r = t.insert().execute(**params)
new_id = r.last_inserted_ids()[0]
return new_id
@@ -365,7 +365,7 @@ def set_thing_props(type_id, thing_id, **props):
#use real columns
def do_update(t):
transactions.add_engine(t.engine)
transactions.add_engine(t.bind)
new_props = dict((t.c[prop], val) for prop, val in props.iteritems())
u = t.update(t.c.thing_id == thing_id, values = new_props)
u.execute()
@@ -376,7 +376,7 @@ def incr_thing_prop(type_id, thing_id, prop, amount):
table = get_thing_table(type_id, action = 'write')[0]
def do_update(t):
transactions.add_engine(t.engine)
transactions.add_engine(t.bind)
u = t.update(t.c.thing_id == thing_id,
values={t.c[prop] : t.c[prop] + amount})
u.execute()
@@ -389,7 +389,7 @@ class CreationError(Exception): pass
#TODO do the things actually exist?
def make_relation(rel_type_id, thing1_id, thing2_id, name, date=None):
table = get_rel_table(rel_type_id, action = 'write')[0]
transactions.add_engine(table.engine)
transactions.add_engine(table.bind)
if not date: date = datetime.now(g.tz)
try:
@@ -412,7 +412,7 @@ def set_rel_props(rel_type_id, rel_id, **props):
return
#use real columns
transactions.add_engine(t.engine)
transactions.add_engine(t.bind)
new_props = dict((t.c[prop], val) for prop, val in props.iteritems())
u = t.update(t.c.rel_id == rel_id, values = new_props)
u.execute()
@@ -456,7 +456,7 @@ def db2py(val, kind):
def set_data(table, type_id, thing_id, **vals):
s = sa.select([table.c.key], sa.and_(table.c.thing_id == thing_id))
transactions.add_engine(table.engine)
transactions.add_engine(table.bind)
keys = [x.key for x in s.execute().fetchall()]
i = table.insert(values = dict(thing_id = thing_id))
@@ -479,7 +479,7 @@ def set_data(table, type_id, thing_id, **vals):
def incr_data_prop(table, type_id, thing_id, prop, amount):
t = table
transactions.add_engine(t.engine)
transactions.add_engine(t.bind)
u = t.update(sa.and_(t.c.thing_id == thing_id,
t.c.key == prop),
values={t.c.value : sa.cast(t.c.value, sa.Float) + amount})
@@ -574,8 +574,8 @@ def del_rel(rel_type_id, rel_id):
table = tables[0]
data_table = tables[3]
transactions.add_engine(table.engine)
transactions.add_engine(data_table.engine)
transactions.add_engine(table.bind)
transactions.add_engine(data_table.bind)
table.delete(table.c.rel_id == rel_id).execute()
data_table.delete(data_table.c.thing_id == rel_id).execute()
@@ -676,8 +676,10 @@ def add_sort(sort, t_table, select):
else sa.asc(real_col))
sa_sort = [make_sa_sort(s) for s in sort]
select.order_by(*sa_sort)
return cols
s = select.order_by(*sa_sort)
return s, cols
def translate_thing_value(rval):
if isinstance(rval, operators.timeago):
@@ -703,10 +705,10 @@ def find_things(type_id, get_cols, sort, limit, constraints):
s.append_whereclause(sa_op(op))
if sort:
add_sort(sort, {'_': table}, s)
s, cols = add_sort(sort, {'_': table}, s)
if limit:
s.limit = limit
s = s.limit(limit)
r = s.execute()
return Results(r, lambda(row): row if get_cols else row.thing_id)
@@ -776,13 +778,13 @@ def find_data(type_id, get_cols, sort, limit, constraints):
#TODO in order to sort by data columns, this is going to need to be smarter
if sort:
need_join = True
add_sort(sort, {'_':t_table}, s)
s, cols = add_sort(sort, {'_':t_table}, s)
if need_join:
s.append_whereclause(first_alias.c.thing_id == t_table.c.thing_id)
if limit:
s.limit = limit
s = s.limit(limit)
r = s.execute()
@@ -838,9 +840,9 @@ def find_rels(rel_type_id, get_cols, sort, limit, constraints):
s.append_whereclause(sa_op(op))
if sort:
cols = add_sort(sort,
{'_':r_table, '_t1_':t1_table, '_t2_':t2_table},
s)
s, cols = add_sort(sort,
{'_':r_table, '_t1_':t1_table, '_t2_':t2_table},
s)
#do we need more joins?
for (col, table) in cols:
@@ -854,8 +856,8 @@ def find_rels(rel_type_id, get_cols, sort, limit, constraints):
s.append_whereclause(r_table.c[col] == table.c.thing_id)
if limit:
s.limit = limit
s = s.limit(limit)
r = s.execute()
return Results(r, lambda (row): (row if get_cols else row.rel_id))

49
r2/r2/models/mail_queue.py
View File

@@ -168,7 +168,8 @@ class EmailHandler(object):
if email:
o = self.opt_table
try:
o.insert().execute({o.c.email: email, o.c.msg_hash: msg_hash})
o.insert().values({o.c.email: email,
o.c.msg_hash: msg_hash}).execute()
#clear caches
has_opted_out(email, _update = True)
@@ -210,17 +211,17 @@ class EmailHandler(object):
tid = thing._fullname if thing else ""
key = sha.new(str((email, from_name, uid, tid, ip, kind, body,
datetime.datetime.now()))).hexdigest()
s.insert().execute({s.c.to_addr : email,
s.c.account_id : uid,
s.c.from_name : from_name,
s.c.fr_addr : fr_addr,
s.c.reply_to : reply_to,
s.c.fullname: tid,
s.c.ip : ip,
s.c.kind: kind,
s.c.body: body,
s.c.date : date,
s.c.msg_hash : key})
s.insert().values({s.c.to_addr : email,
s.c.account_id : uid,
s.c.from_name : from_name,
s.c.fr_addr : fr_addr,
s.c.reply_to : reply_to,
s.c.fullname: tid,
s.c.ip : ip,
s.c.kind: kind,
s.c.body: body,
s.c.date : date,
s.c.msg_hash : key}).execute()
hashes.append(key)
return hashes
@@ -333,18 +334,18 @@ class Email(object):
from pylons import g
self.date = date or datetime.datetime.now(g.tz)
t = self.handler.reject_table if rejected else self.handler.track_table
t.insert().execute({t.c.account_id:
self.user._id if self.user else 0,
t.c.to_addr : self.to_addr,
t.c.fr_addr : self.fr_addr,
t.c.reply_to : self.reply_to,
t.c.ip : self.ip,
t.c.fullname:
self.thing._fullname if self.thing else "",
t.c.date: self.date,
t.c.kind : self.kind,
t.c.msg_hash : self.msg_hash,
})
t.insert().values({t.c.account_id:
self.user._id if self.user else 0,
t.c.to_addr : self.to_addr,
t.c.fr_addr : self.fr_addr,
t.c.reply_to : self.reply_to,
t.c.ip : self.ip,
t.c.fullname:
self.thing._fullname if self.thing else "",
t.c.date: self.date,
t.c.kind : self.kind,
t.c.msg_hash : self.msg_hash,
}).execute()
self.sent = True
def to_MIMEText(self):

2
r2/r2/models/report.py
View File

@@ -458,7 +458,7 @@ def unreport_account(user, correct = True, types = (Link, Comment, Message),
table = table.name,
dtable = dtable.name,
author_id = user._id)
table.engine.execute(u)
table.bind.execute(u)
# grab a list of all the things we just blew away and update the cache
s = sa.select([table.c.thing_id], by_user_query)

4
r2/r2/models/thing_changes.py
View File

@@ -37,14 +37,14 @@ def index_str(table, name, on, where = None):
def create_table(table, index_commands=None, force = False):
t = table
if g.db_create_tables:
if not t.engine.has_table(t.name) or force:
if not t.bind.has_table(t.name) or force:
try:
t.create(checkfirst = False)
except: pass
if index_commands:
for i in index_commands:
try:
t.engine.execute(i)
t.bind.execute(i)
except: pass
def change_table(metadata):

4
r2/r2/public/static/css/reddit.css
View File

@@ -781,7 +781,7 @@ a.star { text-decoration: none; color: #ff8b60 }
.linkcompressed .entry .buttons li a {
padding: 0 2px;
background-color: #f0f0f0;
font-weight: normal
font-weight: bold
}
.linkcompressed .midcol { width: 15px; }
@@ -1821,4 +1821,4 @@ ul#image-preview-list .description pre {
padding: 10px;
border: 1px solid #B0B0B0;
margin-left: 10px;
margin-bottom: 10px; }
margin-bottom: 10px; }

17
r2/setup.py
View File

@@ -55,16 +55,6 @@ except ImportError:
print "Installing the PyCaptcha Module"
easy_install(["http://svn.navi.cx/misc/trunk/pycaptcha"])
# unfortunately, we use an old version of sqlalchemy right now
try:
import sqlalchemy
vers = sqlalchemy.__version__
assert vers == "0.3.10", \
("reddit is only compatible with SqlAlchemy 0.3.10 not '%s' " % vers)
except ImportError:
print "Installing Sqlalchemy 0.3.10 from the cheese shop"
easy_install(["http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.3.10.tar.gz"])
# ditto for pylons
try:
import pylons
@@ -85,14 +75,15 @@ setup(
#author="",
#author_email="",
#url="",
install_requires=["Pylons==0.9.6.2",
install_requires=["Routes<=1.7.3",
"Pylons<=0.9.6.2",
"pytz",
"pycrypto",
"Babel>=0.9.1",
"flup",
"simplejson",
"SQLAlchemy==0.3.10",
"BeautifulSoup >= 3",
"SQLAlchemy==0.5.3",
"BeautifulSoup >= 3",
"cssutils",
"chardet",
"psycopg2",