Merge lp:~robru/bileto/never-run-out-of-ids into lp:bileto

[Robert Bruce Park]

Convert id columns to bigint Just In Case.

[Robert Bruce Park (robru)]

Worked in staging.

review: Approve

[lp:~robru/bileto/never-run-out-of-ids]

300. By Robert Bruce Park on 2015-10-09

Use BigInteger in models too

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/bileto-ci/74/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/74/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robru/bileto/never-run-out-of-ids]

301. By Robert Bruce Park on 2015-10-09

Use INTEGER in sqlite to work around bug.

302. By Robert Bruce Park on 2015-10-09

Use BIGINT for postgres and INTEGER for sqlite.

[Robert Bruce Park (robru)]

Reconfirmed in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/bileto-ci/75/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bileto-ci/75/rebuild

review: Approve (continuous-integration)

=== modified file 'db_migrations.sh'
--- db_migrations.sh	2015-09-30 21:07:31 +0000
+++ db_migrations.sh	2015-10-09 22:16:50 +0000
@@ -3,7 +3,7 @@
 # Super ultra-lightweight db migrations crafted by hand because the necessary
 # flask/sqlalchemy migrations bits aren't available for python3 in trusty.
 
-exit 0  # No migrations are currently required.
+# exit 0  # No migrations are currently required.
 
 CONNECTION=$(tr ':/@' ' ' < "$HOME/bileto.postgresql.info")
 USER=$(echo "$CONNECTION" | awk '{ print $2 }')
@@ -26,6 +26,10 @@
     $PG "SELECT pg_terminate_backend($pid);"
 done
 
+$PG "ALTER TABLE comment ALTER COLUMN request_id SET DATA TYPE bigint;"
+$PG "ALTER TABLE comment ALTER COLUMN id SET DATA TYPE bigint;"
+$PG "ALTER TABLE request ALTER COLUMN request_id SET DATA TYPE bigint;"
+
 # These ones have succeeded in production and only kept for reference
 # $PG "ALTER TABLE comment ADD COLUMN log_url text DEFAULT '';" || true
 # $PG "ALTER TABLE comment ADD COLUMN published_versions text DEFAULT '';" || true

=== modified file 'tickets/models.py'
--- tickets/models.py	2015-10-06 23:59:17 +0000
+++ tickets/models.py	2015-10-09 22:16:50 +0000
@@ -8,12 +8,19 @@
 
 from flask import session
 from datetime import datetime
+from sqlalchemy import BigInteger
+from sqlalchemy.dialects import sqlite
 from sqlalchemy.orm import relationship
 from sqlalchemy.inspection import inspect
 
 from tickets.app import db
 
 
+# SQLite can't handle the BigInts, so we overload that for unit tests.
+# Behaves like proper bigint should in production postgres.
+BigInt = BigInteger().with_variant(sqlite.INTEGER(), 'sqlite')
+
+
 CHAR_MAX = 1000
 WORD = re.compile('\W+')
 
@@ -133,7 +140,7 @@
 class Request(db.Model, BiletoModel):
     """Contains all data associated with one landing request."""
     request_id = db.Column(
-        db.Integer, primary_key=True, doc='Request ID')
+        BigInt, primary_key=True, doc='Request ID')
     date = db.Column(db.DateTime, default=right_now, doc='Creation Date')
 
     test_plan = db.Column(db.Text, default='', doc=TEST_PLAN)
@@ -210,9 +217,9 @@
 
 class Comment(db.Model, BiletoModel):
     """Stores one comment on a landing request."""
-    id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(BigInt, primary_key=True)
     request_id = db.Column(
-        db.Integer, db.ForeignKey(Request.request_id), nullable=False)
+        BigInt, db.ForeignKey(Request.request_id), nullable=False)
     author = db.Column(db.Text, nullable=False)
     text = db.Column(db.Text, default='')
     date = db.Column(db.DateTime, default=right_now)