Remove support for pysqlite2

issue11316
review366931002
This commit is contained in:
Cédric Krier
2022-04-04 00:14:03 +02:00
parent 60a6d5f390
commit 115d185c55
3 changed files with 5 additions and 14 deletions
+1
View File
@@ -1,3 +1,4 @@
* Remove support for pysqlite2
* Do not import empty One2Many data
* Deduplicate entries in domain inversion's simplify
* Prevent to create and delete singleton
+4 -11
View File
@@ -5,29 +5,22 @@ import logging
import math
import os
import random
import sqlite3 as sqlite
import threading
import time
import urllib.parse
import warnings
from decimal import Decimal
from sqlite3 import IntegrityError as DatabaseIntegrityError
from sqlite3 import OperationalError as DatabaseOperationalError
from weakref import WeakKeyDictionary
from werkzeug.security import safe_join
try:
from pysqlite2 import dbapi2 as sqlite
from pysqlite2.dbapi2 import IntegrityError as DatabaseIntegrityError
from pysqlite2.dbapi2 import OperationalError as DatabaseOperationalError
except ImportError:
import sqlite3 as sqlite
from sqlite3 import IntegrityError as DatabaseIntegrityError
from sqlite3 import OperationalError as DatabaseOperationalError
from sql import Expression, Flavor, Literal, Null, Query, Table
from sql.conditionals import NullIf
from sql.functions import (
CharLength, CurrentTimestamp, Extract, Function, Overlay, Position,
Substring, Trim)
from werkzeug.security import safe_join
from trytond.backend.database import DatabaseInterface, SQLType
from trytond.config import config, parse_uri
-3
View File
@@ -123,9 +123,6 @@ def _sqlite_copy(file_, restore=False):
with Transaction().start(DB_NAME, 0) as transaction, \
sqlite.connect(file_) as conn2:
conn1 = transaction.connection
# sqlitebck does not work with pysqlite2
if not isinstance(conn1, sqlite.Connection):
return False
if restore:
conn2, conn1 = conn1, conn2
if hasattr(conn1, 'backup'):