summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnts Aasma <ants.aasma@gmail.com>2007-09-29 06:21:34 +0000
committerAnts Aasma <ants.aasma@gmail.com>2007-09-29 06:21:34 +0000
commit4924007317f6d3cb9655b258c01ff888fb3f4a28 (patch)
treeeb7627a62ca157a8a157521b488096f39932a880 /lib
parent51b32cd809bfbdd98afc978da4b6739741983b82 (diff)
downloadsqlalchemy-4924007317f6d3cb9655b258c01ff888fb3f4a28.tar.gz
- added partial index support for postgres
- fixed create and drop methods on MockConnection
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/databases/postgres.py18
-rw-r--r--lib/sqlalchemy/engine/strategies.py4
-rw-r--r--lib/sqlalchemy/schema.py5
3 files changed, 23 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 7518a016e..76f17bb5b 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -4,7 +4,7 @@
# This module is part of SQLAlchemy and is released under
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-import re, random, warnings
+import re, random, warnings, string
from sqlalchemy import sql, schema, exceptions, util
from sqlalchemy.engine import base, default
@@ -612,6 +612,22 @@ class PGSchemaGenerator(compiler.SchemaGenerator):
if not sequence.optional and (not self.checkfirst or not self.dialect.has_sequence(self.connection, sequence.name)):
self.append("CREATE SEQUENCE %s" % self.preparer.format_sequence(sequence))
self.execute()
+
+ def visit_index(self, index):
+ preparer = self.preparer
+ self.append("CREATE ")
+ if index.unique:
+ self.append("UNIQUE ")
+ self.append("INDEX %s ON %s (%s)" \
+ % (preparer.format_index(index),
+ preparer.format_table(index.table),
+ string.join([preparer.format_column(c) for c in index.columns], ', ')))
+ if index.postgres_where is not None:
+ compiler = self._compile(index.postgres_where, None)
+ # this might belong to the compiler class
+ inlined_clause = str(compiler) % dict((key,bind.value) for key,bind in compiler.binds.iteritems())
+ self.append(" WHERE " + inlined_clause)
+ self.execute()
class PGSchemaDropper(compiler.SchemaDropper):
def visit_sequence(self, sequence):
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 524c4b0d5..175846ff8 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -197,11 +197,11 @@ class MockEngineStrategy(EngineStrategy):
def create(self, entity, **kwargs):
kwargs['checkfirst'] = False
- entity.accept_visitor(self.dialect.schemagenerator(self, **kwargs))
+ self.dialect.schemagenerator(self.dialect ,self, **kwargs).traverse(entity)
def drop(self, entity, **kwargs):
kwargs['checkfirst'] = False
- entity.accept_visitor(self.dialect.schemadropper(self, **kwargs))
+ self.dialect.schemadropper(self.dialect, self, **kwargs).traverse(entity)
def execute(self, object, *multiparams, **params):
raise NotImplementedError()
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 713adc585..fce181cbb 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -947,13 +947,16 @@ class Index(SchemaItem):
unique
Defaults to False: create a unique index.
-
+
+ postgres_where
+ Defaults to None: create a partial index when using PostgreSQL
"""
self.name = name
self.columns = []
self.table = None
self.unique = kwargs.pop('unique', False)
+ self.postgres_where = kwargs.pop('postgres_where', None)
self._init_items(*columns)
def _init_items(self, *args):