yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Setup/Sqlgen

Browse Source 
* fixed setup skipping custom data if it was >stepSize away from the last entry
This commit is contained in:
Sarjuuk
2016-08-15 00:03:46 +02:00
parent 674a2a7814
commit 321c9ba7f4
6 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
localization/locale_frfr.php
View File

@@ -301,7 +301,7 @@ $lang = array(
'groups' => array( 'groups' => array(
-1 => "None", "Testeur", "Administrateur", "Éditeur", "Modérateur", "Bureaucrate", -1 => "None", "Testeur", "Administrateur", "Éditeur", "Modérateur", "Bureaucrate",
"Développeur", "VIP", "Bloggeur", "Premium", "Traducteur", "Agent de ventes", "Développeur", "VIP", "Bloggeur", "Premium", "Traducteur", "Agent de ventes",
"Gestionnaire de capture d'écran","Gestionnaire de vidéos" "Partenaire API", "En attente" "Gestionnaire de capture d'écran","Gestionnaire de vidéos", "Partenaire API", "En attente"
), ),
// signIn // signIn
'doSignIn' => "Connexion à votre compte Aowow", 'doSignIn' => "Connexion à votre compte Aowow",

17
setup/tools/sqlgen/creature.func.php
View File

@@ -91,12 +91,13 @@ function creature(array $ids = [])
creature_template_locale ctl8 ON ct.entry = ctl8.entry AND ctl8.`locale` = "ruRU" creature_template_locale ctl8 ON ct.entry = ctl8.entry AND ctl8.`locale` = "ruRU"
LEFT JOIN LEFT JOIN
instance_encounters ie ON ie.creditEntry = ct.entry AND ie.creditType = 0 instance_encounters ie ON ie.creditEntry = ct.entry AND ie.creditType = 0
{
WHERE WHERE
ct.entry IN (?a) ct.entry > ?d
{
AND ct.entry IN (?a)
} }
LIMIT LIMIT
?d, ?d'; ?d';
$dummyQuery = ' $dummyQuery = '
UPDATE UPDATE
@@ -124,12 +125,14 @@ function creature(array $ids = [])
c.modelId = cdi.modelId, c.modelId = cdi.modelId,
c.iconString = cdi.iconString'; c.iconString = cdi.iconString';
$offset = 0; $lastMax = 0;
while ($npcs = DB::World()->select($baseQuery, NPC_CU_INSTANCE_BOSS, $ids ?: DBSIMPLE_SKIP, $offset, SqlGen::$stepSize)) while ($npcs = DB::World()->select($baseQuery, NPC_CU_INSTANCE_BOSS, $lastMax, $ids ?: DBSIMPLE_SKIP, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($npcs))); $newMax = max(array_column($npcs, 'entry'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($npcs as $npc) foreach ($npcs as $npc)
DB::Aowow()->query('REPLACE INTO ?_creature VALUES (?a)', array_values($npc)); DB::Aowow()->query('REPLACE INTO ?_creature VALUES (?a)', array_values($npc));

17
setup/tools/sqlgen/items.func.php
View File

@@ -116,19 +116,22 @@ function items(array $ids = [])
spell_group sg ON sg.spell_id = it.spellid_1 AND it.class = 0 AND it.subclass = 2 AND sg.id IN (1, 2) spell_group sg ON sg.spell_id = it.spellid_1 AND it.class = 0 AND it.subclass = 2 AND sg.id IN (1, 2)
LEFT JOIN LEFT JOIN
game_event ge ON ge.holiday = it.HolidayId AND it.HolidayId > 0 game_event ge ON ge.holiday = it.HolidayId AND it.HolidayId > 0
{
WHERE WHERE
ct.entry IN (?a) it.entry > ?d
{
AND it.entry IN (?a)
} }
LIMIT LIMIT
?d, ?d'; ?d';
$offset = 0; $lastMax = 0;
while ($items = DB::World()->select($baseQuery, $ids ?: DBSIMPLE_SKIP, $offset, SqlGen::$stepSize)) while ($items = DB::World()->select($baseQuery, $lastMax, $ids ?: DBSIMPLE_SKIP, $offset, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($items))); $newMax = max(array_column($items, 'entry'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($items as $item) foreach ($items as $item)
DB::Aowow()->query('REPLACE INTO ?_items VALUES (?a)', array_values($item)); DB::Aowow()->query('REPLACE INTO ?_items VALUES (?a)', array_values($item));

17
setup/tools/sqlgen/objects.func.php
View File

@@ -75,14 +75,15 @@ function objects(array $ids = [])
gameobject_template_locale gtl8 ON go.entry = gtl8.entry AND gtl8.`locale` = "ruRU" gameobject_template_locale gtl8 ON go.entry = gtl8.entry AND gtl8.`locale` = "ruRU"
LEFT JOIN LEFT JOIN
gameobject_questitem gqi ON gqi.GameObjectEntry = go.entry gameobject_questitem gqi ON gqi.GameObjectEntry = go.entry
{
WHERE WHERE
go.entry IN (?a) go.entry > ?d
{
AND go.entry IN (?a)
} }
GROUP BY GROUP BY
go.entry go.entry
LIMIT LIMIT
?d, ?d'; ?d';
$updateQuery = ' $updateQuery = '
UPDATE UPDATE
@@ -100,12 +101,14 @@ function objects(array $ids = [])
o.id IN (?a) o.id IN (?a)
}'; }';
$offset = 0; $lastMax = 0;
while ($objects = DB::World()->select($baseQuery, $ids ?: DBSIMPLE_SKIP, $offset, SqlGen::$stepSize)) while ($objects = DB::World()->select($baseQuery, $lastMax, $ids ?: DBSIMPLE_SKIP, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($objects))); $newMax = max(array_column($objects, 'entry'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($objects as $o) foreach ($objects as $o)
DB::Aowow()->query('REPLACE INTO ?_objects VALUES (?a)', array_values($o)); DB::Aowow()->query('REPLACE INTO ?_objects VALUES (?a)', array_values($o));

17
setup/tools/sqlgen/quests.func.php
View File

@@ -101,12 +101,13 @@ function quests(array $ids = [])
locales_quest lq ON q.ID = lq.Id locales_quest lq ON q.ID = lq.Id
LEFT JOIN LEFT JOIN
game_event_seasonal_questrelation gesqr ON gesqr.questId = q.ID game_event_seasonal_questrelation gesqr ON gesqr.questId = q.ID
{
WHERE WHERE
q.ID IN (?a) q.Id > ?d
{
AND q.Id IN (?a)
} }
LIMIT LIMIT
?d, ?d'; ?d';
$xpQuery = ' $xpQuery = '
UPDATE UPDATE
@@ -140,12 +141,14 @@ function quests(array $ids = [])
}'; }';
$offset = 0; $lastMax = 0;
while ($quests = DB::World()->select($baseQuery, $ids ?: DBSIMPLE_SKIP, $offset, SqlGen::$stepSize)) while ($quests = DB::World()->select($baseQuery, $lastMax, $ids ?: DBSIMPLE_SKIP, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($quests))); $newMax = max(array_column($quests, 'Id'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($quests as $q) foreach ($quests as $q)
DB::Aowow()->query('REPLACE INTO ?_quests VALUES (?a)', array_values($q)); DB::Aowow()->query('REPLACE INTO ?_quests VALUES (?a)', array_values($q));

28
setup/tools/sqlgen/spell.func.php
View File

@@ -110,8 +110,10 @@ function spell()
0 AS spellDifficulty 0 AS spellDifficulty
FROM FROM
spell_dbc spell_dbc
WHERE
Id > ?d
LIMIT LIMIT
?d, ?d'; ?d';
$baseQuery = ' $baseQuery = '
SELECT SELECT
@@ -209,19 +211,23 @@ function spell()
dbc_spellradius sr2 ON s.effect2RadiusId = sr2.Id dbc_spellradius sr2 ON s.effect2RadiusId = sr2.Id
LEFT JOIN LEFT JOIN
dbc_spellradius sr3 ON s.effect3RadiusId = sr3.Id dbc_spellradius sr3 ON s.effect3RadiusId = sr3.Id
WHERE
s.Id > ?d
LIMIT LIMIT
?d, ?d'; ?d';
$serverside = []; $serverside = [];
// merge serverside spells into dbc_spell (should not affect other scripts) // merge serverside spells into dbc_spell (should not affect other scripts)
$offset = 0; $lastMax = 0;
CLISetup::log(' - merging serverside spells into spell.dbc'); CLISetup::log(' - merging serverside spells into spell.dbc');
while ($spells = DB::World()->select($ssQuery, $offset, SqlGen::$stepSize)) while ($spells = DB::World()->select($ssQuery, $lastMax, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($spells))); $newMax = max(array_column($spells, 'Id'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($spells as $id => $spell) foreach ($spells as $id => $spell)
{ {
@@ -231,13 +237,15 @@ function spell()
} }
// merge everything into aowow_spell // merge everything into aowow_spell
$offset = 0; $lastMax = 0;
CLISetup::log(' - filling aowow_spell'); CLISetup::log(' - filling aowow_spell');
while ($spells = DB::Aowow()->select($baseQuery, $offset, SqlGen::$stepSize)) while ($spells = DB::Aowow()->select($baseQuery, $lastMax, SqlGen::$stepSize))
{ {
CLISetup::log(' * sets '.($offset + 1).' - '.($offset + count($spells))); $newMax = max(array_column($spells, 'Id'));
$offset += SqlGen::$stepSize; CLISetup::log(' * sets '.($lastMax + 1).' - '.$newMax);
$lastMax = $newMax;
foreach ($spells as $spell) foreach ($spells as $spell)
DB::Aowow()->query('REPLACE INTO ?_spell VALUES (?a)', array_values($spell)); DB::Aowow()->query('REPLACE INTO ?_spell VALUES (?a)', array_values($spell));