Further simplify DB code.

diff --git a/src/ytplom/db.py b/src/ytplom/db.py
index 0703b05ba38b9a84f53d47ab16f578f383cb25bc..993341c4a02cc07767f37ffa47c2a484bdc8c488 100644 (file)
--- a/src/ytplom/db.py
+++ b/src/ytplom/db.py
@@ -94,14 +94,12 @@ class DbConn:
 
     def exec(self, sql: SqlText, inputs: tuple[Any, ...] = tuple()
              ) -> DbCursor:
 
     def exec(self, sql: SqlText, inputs: tuple[Any, ...] = tuple()
              ) -> DbCursor:

-        """Wrapper around sqlite3.Connection.execute."""
-        return self._conn.execute(sql, inputs)
-
-    def exec_on_values(self, sql: SqlText, inputs: tuple[Any, ...]
-                       ) -> DbCursor:
-        """Wraps .exec on inputs, affixes to sql proper ' VALUES (?, …)'."""
-        q_marks = '(' + ','.join(['?'] * len(inputs)) + ')'
-        return self._conn.execute(f'{sql} VALUES {q_marks}', inputs)
+        """Wrapper around sqlite3.Connection.execute, building '?' if inputs"""
+        if len(inputs) > 0:
+            q_marks = ('?' if len(inputs) == 1
+                       else '(' + ','.join(['?'] * len(inputs)) + ')')
+            return self._conn.execute(SqlText(f'{sql} {q_marks}'), inputs)
+        return self._conn.execute(sql)

 
     def exec_script(self, sql: SqlText) -> DbCursor:
         """Wrapper around sqlite3.Connection.executescript."""
 
     def exec_script(self, sql: SqlText) -> DbCursor:
         """Wrapper around sqlite3.Connection.executescript."""


@@ -143,8 +141,7 @@ class DbData:
     @classmethod
     def get_one(cls, conn: DbConn, id_: str | Hash) -> Self:
         """Return single entry of id_ from DB."""
     @classmethod
     def get_one(cls, conn: DbConn, id_: str | Hash) -> Self:
         """Return single entry of id_ from DB."""

-        sql = SqlText(f'SELECT * FROM {cls._table_name} '
-                      f'WHERE {cls.id_name} = ?')
+        sql = SqlText(f'SELECT * FROM {cls._table_name} WHERE {cls.id_name} =')

         id__ = id_.bytes if isinstance(id_, Hash) else id_
         row = conn.exec(sql, (id__,)).fetchone()
         if not row:
         id__ = id_.bytes if isinstance(id_, Hash) else id_
         row = conn.exec(sql, (id__,)).fetchone()
         if not row:


@@ -168,5 +165,5 @@ class DbData:
             elif isinstance(val, Hash):
                 val = val.bytes
             vals += [val]
             elif isinstance(val, Hash):
                 val = val.bytes
             vals += [val]

-        return conn.exec_on_values(SqlText(f'REPLACE INTO {self._table_name}'),
-                                   tuple(vals))
+        return conn.exec(SqlText(f'REPLACE INTO {self._table_name} VALUES'),
+                         tuple(vals))

diff --git a/src/ytplom/migrations.py b/src/ytplom/migrations.py
index d54bdd8854afa617094863b3d4e1b733420c0f01..d5e49a392018aa81103abe96e5cd132b4cb1b8f4 100644 (file)
--- a/src/ytplom/migrations.py
+++ b/src/ytplom/migrations.py
@@ -49,7 +49,7 @@ def _rewrite_files_last_field_processing_first_field(conn: DbConn,
     rows = conn.exec(SqlText('SELECT * FROM files')).fetchall()
     for row in [list(r) for r in rows]:
         row[-1] = cb(row[0])
     rows = conn.exec(SqlText('SELECT * FROM files')).fetchall()
     for row in [list(r) for r in rows]:
         row[-1] = cb(row[0])

-        conn.exec_on_values(SqlText('REPLACE INTO files'), tuple(row))
+        conn.exec(SqlText('REPLACE INTO files VALUES'), tuple(row))

 
 
 def _mig_2_calc_digests(conn: DbConn) -> None:
 
 
 def _mig_2_calc_digests(conn: DbConn) -> None:


@@ -72,7 +72,7 @@ def _mig_2_calc_digests(conn: DbConn) -> None:
         if _LEGIT_YES != reply:
             raise HandledException('Migration aborted!')
         for path in missing:
         if _LEGIT_YES != reply:
             raise HandledException('Migration aborted!')
         for path in missing:

-            conn.exec(SqlText('DELETE FROM files WHERE rel_path = ?'), (path,))
+            conn.exec(SqlText('DELETE FROM files WHERE rel_path ='), (path,))

 
     def hexdigest_file(path):
         print(f'Calculating digest for: {path}')
 
     def hexdigest_file(path):
         print(f'Calculating digest for: {path}')

diff --git a/src/ytplom/misc.py b/src/ytplom/misc.py
index c42b71a109dbbb3929b2cc070a1583a4045b2b6c..3a7022998c7f34055e74160b907083c3ea9960d7 100644 (file)
--- a/src/ytplom/misc.py
+++ b/src/ytplom/misc.py
@@ -255,7 +255,7 @@ class YoutubeQuery(DbData):
                           ) -> list[Self]:
         """Return YoutubeQueries containing YoutubeVideo's ID in results."""
         sql = SqlText('SELECT query_id FROM '
                           ) -> list[Self]:
         """Return YoutubeQueries containing YoutubeVideo's ID in results."""
         sql = SqlText('SELECT query_id FROM '

-                      'yt_query_results WHERE video_id = ?')
+                      'yt_query_results WHERE video_id =')

         query_ids = conn.exec(sql, (video_id,)).fetchall()
         return [cls.get_one(conn, query_id_tup[0])
                 for query_id_tup in query_ids]
         query_ids = conn.exec(sql, (video_id,)).fetchall()
         return [cls.get_one(conn, query_id_tup[0])
                 for query_id_tup in query_ids]


@@ -306,15 +306,15 @@ class YoutubeVideo(DbData):
     def get_all_for_query(cls, conn: DbConn, query_id: QueryId) -> list[Self]:
         """Return all videos for query of query_id."""
         sql = SqlText('SELECT video_id '
     def get_all_for_query(cls, conn: DbConn, query_id: QueryId) -> list[Self]:
         """Return all videos for query of query_id."""
         sql = SqlText('SELECT video_id '

-                      'FROM yt_query_results WHERE query_id = ?')
+                      'FROM yt_query_results WHERE query_id =')

         video_ids = conn.exec(sql, (query_id,)).fetchall()
         return [cls.get_one(conn, video_id_tup[0])
                 for video_id_tup in video_ids]
 
     def save_to_query(self, conn: DbConn, query_id: QueryId) -> None:
         """Save inclusion of self in results to query of query_id."""
         video_ids = conn.exec(sql, (query_id,)).fetchall()
         return [cls.get_one(conn, video_id_tup[0])
                 for video_id_tup in video_ids]
 
     def save_to_query(self, conn: DbConn, query_id: QueryId) -> None:
         """Save inclusion of self in results to query of query_id."""

-        conn.exec_on_values(SqlText('REPLACE INTO yt_query_results'),
-                            (query_id, self.id_))
+        conn.exec(SqlText('REPLACE INTO yt_query_results VALUES'),
+                  (query_id, self.id_))

 
 
 class VideoFile(DbData):
 
 
 class VideoFile(DbData):


@@ -373,7 +373,7 @@ class VideoFile(DbData):
     @classmethod
     def get_by_yt_id(cls, conn: DbConn, yt_id: YoutubeId) -> Self:
         """Return VideoFile of .yt_id."""
     @classmethod
     def get_by_yt_id(cls, conn: DbConn, yt_id: YoutubeId) -> Self:
         """Return VideoFile of .yt_id."""

-        sql = SqlText(f'SELECT * FROM {cls._table_name} WHERE yt_id = ?')
+        sql = SqlText(f'SELECT * FROM {cls._table_name} WHERE yt_id =')

         row = conn.exec(sql, (yt_id,)).fetchone()
         if not row:
             raise NotFoundException(f'no entry for file to Youtube ID {yt_id}')
         row = conn.exec(sql, (yt_id,)).fetchone()
         if not row:
             raise NotFoundException(f'no entry for file to Youtube ID {yt_id}')


@@ -490,7 +490,7 @@ class VideoFile(DbData):
                 file.unlink_locally()
             print(f'SYNC: purging off DB: {file.digest.b64} ({file.rel_path})')
             conn.exec(
                 file.unlink_locally()
             print(f'SYNC: purging off DB: {file.digest.b64} ({file.rel_path})')
             conn.exec(

-                    SqlText(f'DELETE FROM {cls._table_name} WHERE digest = ?'),
+                    SqlText(f'DELETE FROM {cls._table_name} WHERE digest ='),

                     (file.digest.bytes,))
 
 
                     (file.digest.bytes,))