From 6730289cecf6955ebb1a4bfef1675e3376ff5f44 Mon Sep 17 00:00:00 2001
From: Konsta Vesterinen <konsta.vesterinen@gmail.com>
Date: Mon, 21 Apr 2014 11:19:54 +0300
Subject: [PATCH] Add get_columns to main import, bump version

---
 setup.py                            | 2 +-
 sqlalchemy_utils/__init__.py        | 4 +++-
 tests/functions/test_get_columns.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index d1bbf8a..68e75bc 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ for name, requirements in extras_require.items():
 
 setup(
     name='SQLAlchemy-Utils',
-    version='0.25.2',
+    version='0.25.3',
     url='https://github.com/kvesteri/sqlalchemy-utils',
     license='BSD',
     author='Konsta Vesterinen, Ryan Leckey, Janne Vanhala, Vesa Uimonen',
diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py
index ea504bc..5263630 100644
--- a/sqlalchemy_utils/__init__.py
+++ b/sqlalchemy_utils/__init__.py
@@ -5,6 +5,7 @@ from .exceptions import ImproperlyConfigured
 from .functions import (
     defer_except,
     escape_like,
+    get_columns,
     identity,
     primary_keys,
     naturally_equivalent,
@@ -57,7 +58,7 @@ from .types import (
 )
 
 
-__version__ = '0.25.2'
+__version__ = '0.25.3'
 
 
 __all__ = (
@@ -74,6 +75,7 @@ __all__ = (
     force_instant_defaults,
     generates,
     generic_relationship,
+    get_columns,
     identity,
     instrumented_list,
     merge,
diff --git a/tests/functions/test_get_columns.py b/tests/functions/test_get_columns.py
index 4cb866e..42712a8 100644
--- a/tests/functions/test_get_columns.py
+++ b/tests/functions/test_get_columns.py
@@ -1,5 +1,5 @@
 import sqlalchemy as sa
-from sqlalchemy_utils.functions import get_columns
+from sqlalchemy_utils import get_columns
 from tests import TestCase