-
Notifications
You must be signed in to change notification settings - Fork 710
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
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d39acb5
Isolate PreferredJobModel
Be1zebub 0c28f94
== false > not
Be1zebub 78ea723
lua condition > sql condition
Be1zebub cf48e5a
Only create server column if exists
FPtje aff96d9
Create entirely new table to avoid conflicts
FPtje 289c07b
Also load from the old table
FPtje File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
);]]) | ||
|
||
sql.Query("ALTER TABLE darkp_playermodels ADD COLUMN IF NOT EXISTS server VARCHAR(21);") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When testing this, I found out that the |
||
|
||
-- 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 = {} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 samejobcmd
would not be able to have two rows in the table.