Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
181d405a
Commit
181d405a
authored
Mar 20, 2012
by
Michal 'vorner' Vaner
Browse files
[963] Minor whitespace fixes
parent
538350b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/dbutil/dbutil.py.in
View file @
181d405a
...
...
@@ -78,7 +78,7 @@ upgrades = [
# Move to the latest "V1" state of the database if not there
# already.
"CREATE TABLE IF NOT EXISTS diffs (" +
"id INTEGER PRIMARY KEY, " +
"id INTEGER PRIMARY KEY, " +
"zone_id INTEGER NOT NULL," +
"version INTEGER NOT NULL, " +
"operation INTEGER NOT NULL, " +
...
...
@@ -419,7 +419,7 @@ def get_version(db):
def match_version(db, expected):
"""
@brief Check database version against that expected
Checks whether the version of the database matches that expected for
the upgrade. Both the major and minor versions must match.
...
...
src/bin/dbutil/tests/dbutil_test.sh.in
View file @
181d405a
...
...
@@ -287,12 +287,12 @@ rm -f $tempfile $backupfile
echo
"3.1. Database is not an SQLite file - check"
echo
"This is not an sqlite3 database"
>
$tempfile
../run_dbutil.sh
--check
$tempfile
../run_dbutil.sh
--check
$tempfile
failzero
$?
check_no_backup
$tempfile
$backupfile
echo
"3.2. Database is not an SQLite file - upgrade"
../run_dbutil.sh
--upgrade
--noconfirm
$tempfile
../run_dbutil.sh
--upgrade
--noconfirm
$tempfile
failzero
$?
# ...and as before, a backup should have been created
check_backup
$tempfile
$backupfile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment