From e850b11c7c4c0680f65bb5fcde83d48d4b647d25 Mon Sep 17 00:00:00 2001 From: Michael Trier Date: Fri, 30 Jan 2009 04:35:43 +0000 Subject: [PATCH] Resolved merge conflict. --- test/ext/compiler.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/ext/compiler.py b/test/ext/compiler.py index 7116725036..db8930be72 100644 --- a/test/ext/compiler.py +++ b/test/ext/compiler.py @@ -117,25 +117,16 @@ class UserDefinedTest(TestBase, AssertsCompiledSQL): self.assert_compile(DropThingy(), "DROP THINGY" ) - + from sqlalchemy.dialects.postgres import base self.assert_compile(AddThingy(), -<<<<<<< HEAD:test/ext/compiler.py "ADD SPECIAL PG THINGY", dialect=base.dialect() -======= - "ADD SPECIAL SL THINGY", - dialect=create_engine('sqlite://', _initialize=False).dialect ->>>>>>> Couple more corrections to get mssql tests to pass.:test/ext/compiler.py ) self.assert_compile(DropThingy(), "DROP THINGY", -<<<<<<< HEAD:test/ext/compiler.py dialect=base.dialect() -======= - dialect=create_engine('sqlite://', _initialize=False).dialect ->>>>>>> Couple more corrections to get mssql tests to pass.:test/ext/compiler.py ) -- 2.47.3