Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration)
This commit is contained in:
		
							parent
							
								
									44d5adc16f
								
							
						
					
					
						commit
						ac37483d47
					
				| 
						 | 
					@ -494,6 +494,10 @@ def migrate_Database(session):
 | 
				
			||||||
        conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
 | 
					        conn.execute("ALTER TABLE book_read_link ADD column 'last_time_started_reading' DATETIME")
 | 
				
			||||||
        conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
 | 
					        conn.execute("ALTER TABLE book_read_link ADD column 'times_started_reading' INTEGER DEFAULT 0")
 | 
				
			||||||
        session.commit()
 | 
					        session.commit()
 | 
				
			||||||
 | 
					    test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
 | 
				
			||||||
 | 
					    for book in test:
 | 
				
			||||||
 | 
					        book.last_modified = datetime.datetime.utcnow()
 | 
				
			||||||
 | 
					    session.commit()
 | 
				
			||||||
    try:
 | 
					    try:
 | 
				
			||||||
        session.query(exists().where(Shelf.uuid)).scalar()
 | 
					        session.query(exists().where(Shelf.uuid)).scalar()
 | 
				
			||||||
    except exc.OperationalError:
 | 
					    except exc.OperationalError:
 | 
				
			||||||
| 
						 | 
					@ -552,6 +556,7 @@ def migrate_Database(session):
 | 
				
			||||||
        conn.execute("ALTER TABLE user ADD column `allowed_tags` String DEFAULT ''")
 | 
					        conn.execute("ALTER TABLE user ADD column `allowed_tags` String DEFAULT ''")
 | 
				
			||||||
        conn.execute("ALTER TABLE user ADD column `denied_column_value` DEFAULT ''")
 | 
					        conn.execute("ALTER TABLE user ADD column `denied_column_value` DEFAULT ''")
 | 
				
			||||||
        conn.execute("ALTER TABLE user ADD column `allowed_column_value` DEFAULT ''")
 | 
					        conn.execute("ALTER TABLE user ADD column `allowed_column_value` DEFAULT ''")
 | 
				
			||||||
 | 
					        session.commit()
 | 
				
			||||||
    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
 | 
					    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
 | 
				
			||||||
        is None:
 | 
					        is None:
 | 
				
			||||||
        create_anonymous_user(session)
 | 
					        create_anonymous_user(session)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user