- normalize sybase version numbers

- sybase has 255 identifier length on 15, 30 earlier

diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py
index 5814f70da3c1365400570f52b661de5338c9b1b2..bdaab2eb7d5b9c604fd847bec5999185ce446b0f 100644 (file)
--- a/lib/sqlalchemy/dialects/sybase/base.py
+++ b/lib/sqlalchemy/dialects/sybase/base.py
@@ -370,6 +370,14 @@ class SybaseDialect(default.DefaultDialect):
                      text("SELECT user_name() as user_name", typemap={'user_name':Unicode})
              )
 
+    def initialize(self, connection):
+        super(SybaseDialect, self).initialize(connection)
+        if self.server_version_info is not None and\
+            self.server_version_info < (15, ):
+            self.max_identifier_length = 30
+        else:
+            self.max_identifier_length = 255
+        
     @reflection.cache
     def get_table_names(self, connection, schema=None, **kw):
         if schema is None:

diff --git a/lib/sqlalchemy/dialects/sybase/pysybase.py b/lib/sqlalchemy/dialects/sybase/pysybase.py
index 6aad4e4cfa3f81e93803bb1e7549865343329a9f..ee19382500d081d095673d67ae09d9ce637e7915 100644 (file)
--- a/lib/sqlalchemy/dialects/sybase/pysybase.py
+++ b/lib/sqlalchemy/dialects/sybase/pysybase.py
@@ -82,7 +82,9 @@ class SybaseDialect_pysybase(SybaseDialect):
             cursor.execute(statement, param)
 
     def _get_server_version_info(self, connection):
-       return connection.scalar("select @@version_number")
+       vers = connection.scalar("select @@version_number")
+       # i.e. 15500, 15000, 12500 == (15, 5, 0, 0), (15, 0, 0, 0), (12, 5, 0, 0)
+       return (vers / 1000, vers % 1000 / 100, vers % 100 / 10, vers % 10)
 
     def is_disconnect(self, e):
         if isinstance(e, (self.dbapi.OperationalError, self.dbapi.ProgrammingError)):

diff --git a/test/sql/test_labels.py b/test/sql/test_labels.py
index bcac7c01d2acfadd077277262b3d12d46ecf55d7..f67ba9855fd612c344460e4e7aead2e28c0b67e5 100644 (file)
--- a/test/sql/test_labels.py
+++ b/test/sql/test_labels.py
@@ -83,15 +83,18 @@ class LongLabelsTest(TestBase, AssertsCompiledSQL):
             (2, "data2"),
         ], repr(result)
   
-        r = s.limit(2).offset(1).execute()
-        result = []
-        for row in r:
-            result.append((row[table1.c.this_is_the_primarykey_column], row[table1.c.this_is_the_data_column]))
-        assert result == [
-            (2, "data2"),
-            (3, "data3"),
-        ], repr(result)
-
+        @testing.requires.offset
+        def go():
+            r = s.limit(2).offset(1).execute()
+            result = []
+            for row in r:
+                result.append((row[table1.c.this_is_the_primarykey_column], row[table1.c.this_is_the_data_column]))
+            assert result == [
+                (2, "data2"),
+                (3, "data3"),
+            ], repr(result)
+        go()
+        
     def test_table_alias_names(self):
         if testing.against('oracle'):
             self.assert_compile(