fix line ending svn prop

diff --git a/test/dialect/mssql.py b/test/dialect/mssql.py
index 1825141af24902d86c5b41ab2149d09894c43c6e..781f27029f1d38106d600f55974b386eb9c84c21 100755 (executable)
--- a/test/dialect/mssql.py
+++ b/test/dialect/mssql.py
@@ -1,47 +1,47 @@
-import testbase\r
-import re\r
-from sqlalchemy import *\r
-from sqlalchemy.databases import mssql\r
-from testlib import *\r
-\r
-# TODO: migrate all MS-SQL tests here\r
-\r
-class CompileTest(SQLCompileTest):\r
-    __dialect__ = mssql.MSSQLDialect()\r
-        \r
-    def test_insert(self):\r
-        t = table('sometable', column('somecolumn'))\r
-        self.assert_compile(t.insert(), "INSERT INTO sometable (somecolumn) VALUES (:somecolumn)")\r
-\r
-    def test_update(self):\r
-        t = table('sometable', column('somecolumn'))\r
-        self.assert_compile(t.update(t.c.somecolumn==7), "UPDATE sometable SET somecolumn=:somecolumn WHERE sometable.somecolumn = :sometable_somecolumn", dict(somecolumn=10))\r
-\r
-    def test_count(self):\r
-        t = table('sometable', column('somecolumn'))\r
-        self.assert_compile(t.count(), "SELECT count(sometable.somecolumn) AS tbl_row_count FROM sometable")\r
-    \r
-    def test_union(self):\r
-        t1 = table('t1', \r
-            column('col1'),\r
-            column('col2'),\r
-            column('col3'),\r
-            column('col4')\r
-            )\r
-        t2 = table('t2',\r
-            column('col1'),\r
-            column('col2'),\r
-            column('col3'),\r
-            column('col4'))\r
-        \r
-        (s1, s2) = (\r
-                    select([t1.c.col3.label('col3'), t1.c.col4.label('col4')], t1.c.col2.in_("t1col2r1", "t1col2r2")),\r
-            select([t2.c.col3.label('col3'), t2.c.col4.label('col4')], t2.c.col2.in_("t2col2r2", "t2col2r3"))\r
-        )        \r
-        u = union(s1, s2, order_by=['col3', 'col4'])\r
-        self.assert_compile(u, "SELECT t1.col3 AS col3, t1.col4 AS col4 FROM t1 WHERE t1.col2 IN (:t1_col2, :t1_col2_1) UNION SELECT t2.col3 AS col3, t2.col4 AS col4 FROM t2 WHERE t2.col2 IN (:t2_col2, :t2_col2_1) ORDER BY col3, col4")\r
-\r
-        self.assert_compile(u.alias('bar').select(), "SELECT bar.col3, bar.col4 FROM (SELECT t1.col3 AS col3, t1.col4 AS col4 FROM t1 WHERE t1.col2 IN (:t1_col2, :t1_col2_1) UNION SELECT t2.col3 AS col3, t2.col4 AS col4 FROM t2 WHERE t2.col2 IN (:t2_col2, :t2_col2_1)) AS bar")\r
-        \r
-if __name__ == "__main__":\r
-    testbase.main()\r
+import testbase
+import re
+from sqlalchemy import *
+from sqlalchemy.databases import mssql
+from testlib import *
+
+# TODO: migrate all MS-SQL tests here
+
+class CompileTest(SQLCompileTest):
+    __dialect__ = mssql.MSSQLDialect()
+        
+    def test_insert(self):
+        t = table('sometable', column('somecolumn'))
+        self.assert_compile(t.insert(), "INSERT INTO sometable (somecolumn) VALUES (:somecolumn)")
+
+    def test_update(self):
+        t = table('sometable', column('somecolumn'))
+        self.assert_compile(t.update(t.c.somecolumn==7), "UPDATE sometable SET somecolumn=:somecolumn WHERE sometable.somecolumn = :sometable_somecolumn", dict(somecolumn=10))
+
+    def test_count(self):
+        t = table('sometable', column('somecolumn'))
+        self.assert_compile(t.count(), "SELECT count(sometable.somecolumn) AS tbl_row_count FROM sometable")
+    
+    def test_union(self):
+        t1 = table('t1', 
+            column('col1'),
+            column('col2'),
+            column('col3'),
+            column('col4')
+            )
+        t2 = table('t2',
+            column('col1'),
+            column('col2'),
+            column('col3'),
+            column('col4'))
+        
+        (s1, s2) = (
+                    select([t1.c.col3.label('col3'), t1.c.col4.label('col4')], t1.c.col2.in_("t1col2r1", "t1col2r2")),
+            select([t2.c.col3.label('col3'), t2.c.col4.label('col4')], t2.c.col2.in_("t2col2r2", "t2col2r3"))
+        )        
+        u = union(s1, s2, order_by=['col3', 'col4'])
+        self.assert_compile(u, "SELECT t1.col3 AS col3, t1.col4 AS col4 FROM t1 WHERE t1.col2 IN (:t1_col2, :t1_col2_1) UNION SELECT t2.col3 AS col3, t2.col4 AS col4 FROM t2 WHERE t2.col2 IN (:t2_col2, :t2_col2_1) ORDER BY col3, col4")
+
+        self.assert_compile(u.alias('bar').select(), "SELECT bar.col3, bar.col4 FROM (SELECT t1.col3 AS col3, t1.col4 AS col4 FROM t1 WHERE t1.col2 IN (:t1_col2, :t1_col2_1) UNION SELECT t2.col3 AS col3, t2.col4 AS col4 FROM t2 WHERE t2.col2 IN (:t2_col2, :t2_col2_1)) AS bar")
+        
+if __name__ == "__main__":
+    testbase.main()