From e0896904db15918e31cc3d6a7d91ea11c7cebdd9 Mon Sep 17 00:00:00 2001 From: Rick Morrison Date: Sun, 17 Dec 2006 23:14:53 +0000 Subject: [PATCH] added missing ref to between in sql.py __all__ --- lib/sqlalchemy/databases/mssql.py | 7 ++++++- lib/sqlalchemy/schema.py | 6 ++++-- lib/sqlalchemy/sql.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 3cfffd302a..dc92be239c 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -58,7 +58,8 @@ except: import pymssql as dbmodule connect = dbmodule.connect # pymmsql doesn't have a Binary method. we use string - dbmodule.Binary = lambda st: str(st) + # updated: since v.74 binary support is fixed; restriction removed + # dbmodule.Binary = lambda st: str(st) def make_connect_string(keys): if keys.get('port'): # pymssql expects port as host:port, not a separate arg @@ -177,6 +178,10 @@ class MSBoolean(sqltypes.Boolean): else: return value and True or False +class MSPickle(sqltypes.PickleType): + def get_col_spec(self): + return "IMAGE" + colspecs = { sqltypes.Integer : MSInteger, sqltypes.Smallinteger: MSSmallInteger, diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index beb320e5ac..fbee0c7c03 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -911,12 +911,14 @@ class BoundMetaData(MetaData): """builds upon MetaData to provide the capability to bind to an Engine implementation.""" def __init__(self, engine_or_url, name=None, **kwargs): super(BoundMetaData, self).__init__(name, **kwargs) + self.rebind(engine_or_url, **kwargs) + def is_bound(self): + return True + def rebind(self, engine_or_url, **kwargs): if isinstance(engine_or_url, str): self._engine = sqlalchemy.create_engine(engine_or_url, **kwargs) else: self._engine = engine_or_url - def is_bound(self): - return True class DynamicMetaData(MetaData): """builds upon MetaData to provide the capability to bind to multiple Engine implementations diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 1ca6eb93d5..3c0f1584c6 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -10,7 +10,7 @@ from sqlalchemy import types as sqltypes import string, re, random, sets -__all__ = ['text', 'table', 'column', 'func', 'select', 'update', 'insert', 'delete', 'join', 'and_', 'or_', 'not_', 'between_', 'case', 'cast', 'union', 'union_all', 'except_', 'except_all', 'intersect', 'intersect_all', 'null', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'literal', 'bindparam', 'exists', 'extract','AbstractDialect', 'ClauseParameters', 'ClauseVisitor', 'Executor', 'Compiled', 'ClauseElement', 'ColumnElement', 'ColumnCollection', 'FromClause', 'TableClause', 'Select', 'Alias', 'CompoundSelect','Join', 'Selectable'] +__all__ = ['text', 'table', 'column', 'func', 'select', 'update', 'insert', 'delete', 'join', 'and_', 'or_', 'not_', 'between', 'between_', 'case', 'cast', 'union', 'union_all', 'except_', 'except_all', 'intersect', 'intersect_all', 'null', 'desc', 'asc', 'outerjoin', 'alias', 'subquery', 'literal', 'bindparam', 'exists', 'extract','AbstractDialect', 'ClauseParameters', 'ClauseVisitor', 'Executor', 'Compiled', 'ClauseElement', 'ColumnElement', 'ColumnCollection', 'FromClause', 'TableClause', 'Select', 'Alias', 'CompoundSelect','Join', 'Selectable'] def desc(column): """return a descending ORDER BY clause element, e.g.: -- 2.47.2