From 3e5cb27f07c22f32fadf2749069a2228071639e7 Mon Sep 17 00:00:00 2001 From: Andrei Mihu Date: Sat, 17 Mar 2018 15:36:02 +0000 Subject: [PATCH] Improve migration existing database check. --- migrate/migrate-packr.go | 4 ++-- migrate/migrate.go | 6 +++--- migrate/sql/20180103142001_initial_schema.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/migrate/migrate-packr.go b/migrate/migrate-packr.go index de9c98186..60f1d36a7 100644 --- a/migrate/migrate-packr.go +++ b/migrate/migrate-packr.go @@ -9,5 +9,5 @@ import "github.com/gobuffalo/packr" // Go binary. You can use the "packr clean" command to clean up this, // and any other packr generated files. func init() { - packr.PackJSONBytes("./sql", "20180103142001_initial_schema.sql", "\"H4sIAAAAAAAA/7RXXXPiyhF951d0+SFINzKw7N3KrXWSKhnEWlksHCTurvNCDVIjTSzNKDMjMEnlv6dGH4Awxs4mVw8uoznd09N9+kyr/1MHfoIRz3eCxomC4eDDLxAkCB55IhkBu1AJF7IDJW5KQ2QSIyhYhAJUgmDnJEywWbHgVxSScgbD3gAMDbiql67MG+1ixwvIyA4YV1BIBJVQCWuaIuBziLkCyiDkWZ5SwkKELVVJuU/tpad9PNY++EoRyoBAyPMd8PUxEIiqg06Uyj/3+9vttkfKYHtcxP20gsn+1B05nu9cD3uD2mDBUpQSBP6joAIjWO2A5HlKQ7JKEVKyBS6AxAIxAsV1wFtBFWWxBZKv1ZYI1G4iKpWgq0K18tWER2ULwBkQBle2D65/Bbe27/qWdvLNDe5miwC+2fO57QWu48NsDqOZN3YDd+b5MJuA7T3CV9cbW4BUJSgAn3OhT8AFUJ1JjMq0+YitENa8CknmGNI1DSElLC5IjBDzDQpGWQw5ioxKXVEJhEXaTUozqogqX704l96o3+lcX8PvMxoLohAWeWc0d+zAgcC+nTrgTsCbBeB8d/3A1xwQEowOAMDD3L2354/w1XkEg0am1Slf0wiOnsXCHR9+aU/eYjq1SqR2xkiG1dqv9nx0Z8+ND8NfTNA584O57XpBteeyAS+fcAcLz/3rwjlxF1GZp2S3rFw27oafPpnVOtkQRcSyEOnxdof16+uSfPJzv684T2WPolqX7EtUlvZXYf7zH0qgTvxSkfgkbh02jJ2JvZgG0EXWrdymPCzT30aX2+otsRf34MonDCaCsJDKkFswsq9KW0Uz/CdneNH2gVR8CGiGYCx8+B2MCCMRMSsnGSoSEUUqJ3/xZ97tviD7cP/17+5JOrckTVE1wHebYUZougcehwx12SpcTqTcclGT5fYxcOy91ejOGX0FI0UWq8RokCb8ET4OB4NBXa81CXHF+dOyZFybPsc7xZzHKS5rXl7AkQxDZAqFxr6OkwpJ1ri7gAsLqXj29r4YxbgMecHKZGvGw4tED5qcHIH//CcYmCfZDwUShUvNGwAI3HvHD+z7h+BvR74Y3xqndkUe/ZDdBgVd7y7bjWw/MAZg+8frp44iKrVe155+yFHHvCmlzEdV5ODvpMKsFI9ex/V8Zx7o3M4aCaORtRcgs1NVaLpwfDC6g/q5PvOneboWdLuV3czTajWZuqNAyyCMZzqkO9f7ctN5S0uXEW5oiK8qqn47mc0d94tXvS2N9C5zZ+LMHW/k+IcTmTqWsTN1Akcna2SPnTOi3GbiOVFuONsWb2hn+q2TaaaeO5fkhQh1O1ogFVFoQc4l1Qp57rx7tFmF8O5jv/AUoVSUlVL8Awncx3HmWmsnsDlNvXjrfjm09B6p1XuhRzN9q0suFHCh72bOQPCt7J1pynZTXGrK9kkvxVoW4FBf/96eTptoD9LTinotKLLIGJgWULahCo0P+38jY2hasEp5+ISR8dG0IMIU9fufTQuICBO6wcj4ZFY5rW/xY0acFOktojGu9NVX3a9Gc4tP3O/3zmcIefgkOAmTrh6GSLqTKPQgp2fZMMWNHr0YL+IEtgmylnQmRMLY8UeQ8Qh1UfTMRFmEz72XhK47xmp5sP2RBb9ZC5825tG0dJySJY1eH5fe0+g1S4rV3zFULfGoLvRTZMiZwuoeO5kYLs4Moc7yOQ6etoyHMVF0g7AhaYESiECQldALlCg25eysQ0Y96lbHu3y446K1r53XmuwtUkrFBTmvfSFPUwx1aSwQSCILnnBnNaX4P5LlsNFbeq/50Tz/+81QTwW6OvXKf0GDTf0xehzKx6H5kgZZ9Em3aKI/Iqu9eMnQqvY6sa+xqdn9QzNPleBzk5T+SMT3eqnAbw1k76PXy4HsvXYtUT2mWotkmr41e11v7Hw/Ye/Bbqlzs6zNtI4safSsGbcn+Es677XwCXf1OLb/shzzLeuM57OHQ9e0O+bm/Oqxor0C2Q8cl9arUesCQt50/hMAAP//lEWCx2ERAAA=\"") - } + packr.PackJSONBytes("./sql", "20180103142001_initial_schema.sql", "\"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\"") +} diff --git a/migrate/migrate.go b/migrate/migrate.go index 2a3a5d089..8db219581 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -31,9 +31,9 @@ import ( const ( dbErrorDuplicateDatabase = "42P04" - migrationTable = "migration_info" - dialect = "postgres" - defaultLimit = -1 + migrationTable = "migration_info" + dialect = "postgres" + defaultLimit = -1 ) type statusRow struct { diff --git a/migrate/sql/20180103142001_initial_schema.sql b/migrate/sql/20180103142001_initial_schema.sql index 433402691..3b14a4bc4 100644 --- a/migrate/sql/20180103142001_initial_schema.sql +++ b/migrate/sql/20180103142001_initial_schema.sql @@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS user_edge ( CREATE TABLE IF NOT EXISTS notification ( -- FIXME: cockroach's analyser is not clever enough when create_time has DESC mode on the index. - PRIMARY KEY (user_id, create_time ASC, id), + PRIMARY KEY (user_id, create_time, id), FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE, id UUID CONSTRAINT notification_id_key UNIQUE NOT NULL, -- GitLab