Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Isolate PreferredJobModel #3266

Merged
merged 6 commits into from
Sep 28, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions gamemode/modules/base/cl_jobmodels.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
-- Create a table for the preferred playermodels
--
-- Note: the server column wasn't always there, so players may not have a value
-- for it, even though the code in this file always adds it. That is why it is
-- added as a NULLable column.
sql.Query([[CREATE TABLE IF NOT EXISTS darkp_playermodels(
jobcmd VARCHAR(45) NOT NULL PRIMARY KEY,
model VARCHAR(140) NOT NULL
model VARCHAR(140) NOT NULL,
server TEXT NULL
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I realized as well: with jobcmd still being the primary key, two different servers with the same jobcmd would not be able to have two rows in the table.

);]])

sql.Query("ALTER TABLE darkp_playermodels ADD COLUMN IF NOT EXISTS server VARCHAR(21);")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When testing this, I found out that the IF NOT EXISTS construct does not exist in SQLite. You have to PRAGMA table_info(...) to find out whether the column exists.


-- Migration: the `server` column was added in 2024-09. With the above query
-- only creating the table if not exists, the table may not have the `server`
-- column if it was created earlier. This will add it in retrospect.
local tableInfo = sql.Query("PRAGMA table_info(darkp_playermodels)")
local serverColumnExists = false

for _, info in ipairs(tableInfo) do
if info.name == "server" then
serverColumnExists = true
break
end
end

if not serverColumnExists then
sql.Query("ALTER TABLE darkp_playermodels ADD COLUMN server TEXT;")
end

local preferredModels = {}

Expand Down