Skip to content
Permalink
Browse files

More sqlparse not these awesomeness

  • Loading branch information
wsanchez committed Dec 14, 2013
1 parent 4524b8c commit 212ff3b1a3af0de88b2056c4b99a58c09a11f474
Showing with 10 additions and 7 deletions.
  1. +2 −4 twext/enterprise/dal/test/test_parseschema.py
  2. +8 −3 twext/enterprise/dal/test/test_sqlsyntax.py
@@ -25,7 +25,8 @@
try:
from twext.enterprise.dal.parseschema import addSQLToSchema
except ImportError:
addSQLToSchema = NotImplemented
def addSQLToSchema(*args, **kwargs):
raise SkipTest("addSQLToSchema is not available")

from twisted.trial.unittest import TestCase, SkipTest

@@ -40,9 +41,6 @@ def schemaFromString(self, string):
"""
Createa a L{Schema}
"""
if addSQLToSchema is NotImplemented:
raise SkipTest("addSQLToSchema is not available")

s = Schema(self.id())
addSQLToSchema(s, string)
return s
@@ -18,8 +18,15 @@
Tests for L{twext.enterprise.dal.syntax}
"""

from twisted.internet.defer import succeed
from twisted.trial.unittest import TestCase, SkipTest

from twext.enterprise.dal import syntax
from twext.enterprise.dal.parseschema import addSQLToSchema
try:
from twext.enterprise.dal.parseschema import addSQLToSchema
except ImportError:
def addSQLToSchema(*args, **kwargs):
raise SkipTest("addSQLToSchema is not available")
from twext.enterprise.dal.syntax import (
Select, Insert, Update, Delete, Lock, SQLFragment,
TableMismatch, Parameter, Max, Len, NotEnoughValues,
@@ -38,8 +45,6 @@
from twext.enterprise.test.test_adbapi2 import ConnectionPoolHelper
from twext.enterprise.test.test_adbapi2 import NetworkedPoolHelper
from twext.enterprise.test.test_adbapi2 import resultOf, AssertResultHelper
from twisted.internet.defer import succeed
from twisted.trial.unittest import TestCase
from twext.enterprise.dal.syntax import Tuple
from twext.enterprise.dal.syntax import Constant

0 comments on commit 212ff3b

Please sign in to comment.
You can’t perform that action at this time.