From 27fcf2610382484119d5d251f80fbb1892cec002 Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Tue, 28 Mar 2017 23:04:58 +0530 Subject: [PATCH 1/2] Auto stash for cherrypick of "Fixing test_db errors" --- pattern/db/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pattern/db/__init__.py b/pattern/db/__init__.py index b65db990..eed481be 100644 --- a/pattern/db/__init__.py +++ b/pattern/db/__init__.py @@ -1271,7 +1271,7 @@ def filter(self, *args, **kwargs): q = " and ".join(cmp(k, v, "=", self.db.escape) for k, v in kwargs.items()) q = q and " where %s" % q or "" - q = "select %s from `%s`%s;" % (fields, self.name, q) + q = "select %s from '%s'%s;" % (fields, self.name, q) return self.Rows(self, self.db.execute(q)) def find(self, *args, **kwargs): @@ -1306,9 +1306,9 @@ def insert(self, *args, **kwargs): zip((f for f in self.fields if f != self.pk), args[0])) if len(self.default) > 0: kwargs.update(self.default) - k = ", ".join("`%s`" % k for k in kwargs.keys()) - v = ", ".join(self.db.escape(v) for v in kwargs.values()) - q = "insert into `%s` (%s) values (%s);" % (self.name, k, v) + k = ", ".join("'%s'" % k for k in kwargs.keys()) + v = ", ".join("'%s'" % str(v) for v in kwargs.values()) + q = "insert into %s (%s) values (%s);" % (self.name, k, v) self.db.execute(q, commit) return self._insert_id() From 587bfefdfb5bc15f8793d74f68f4c02b9f0ae8b5 Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Tue, 28 Mar 2017 23:04:58 +0530 Subject: [PATCH 2/2] Install pre setup tools --- .travis.yml | 5 +++-- pattern/db/__init__.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fd77973..8e109c72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,19 @@ language: python python: - - "2.6" - - "2.7" - "pypy" - "3.3" - "3.4" + - "3.6" matrix: allow_failures: - python: "3.3" - python: "pypy" + - python: "3.6" install: + - pip install --upgrade --pre setuptools - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install future - python setup.py install --quiet diff --git a/pattern/db/__init__.py b/pattern/db/__init__.py index b65db990..eed481be 100644 --- a/pattern/db/__init__.py +++ b/pattern/db/__init__.py @@ -1271,7 +1271,7 @@ def filter(self, *args, **kwargs): q = " and ".join(cmp(k, v, "=", self.db.escape) for k, v in kwargs.items()) q = q and " where %s" % q or "" - q = "select %s from `%s`%s;" % (fields, self.name, q) + q = "select %s from '%s'%s;" % (fields, self.name, q) return self.Rows(self, self.db.execute(q)) def find(self, *args, **kwargs): @@ -1306,9 +1306,9 @@ def insert(self, *args, **kwargs): zip((f for f in self.fields if f != self.pk), args[0])) if len(self.default) > 0: kwargs.update(self.default) - k = ", ".join("`%s`" % k for k in kwargs.keys()) - v = ", ".join(self.db.escape(v) for v in kwargs.values()) - q = "insert into `%s` (%s) values (%s);" % (self.name, k, v) + k = ", ".join("'%s'" % k for k in kwargs.keys()) + v = ", ".join("'%s'" % str(v) for v in kwargs.values()) + q = "insert into %s (%s) values (%s);" % (self.name, k, v) self.db.execute(q, commit) return self._insert_id()