Seth 7 лет назад
Родитель
Сommit
c010bda6d5
3 измененных файлов: 127 добавлений и 49 удалений
  1. 71
    43
      pokemon_sql/.idea/workspace.xml
  2. 33
    6
      pokemon_sql/Part3.sql
  3. 23
    0
      pokemon_sql/Part4.sql

+ 71
- 43
pokemon_sql/.idea/workspace.xml Просмотреть файл

@@ -52,36 +52,41 @@
52 52
     <session id="-2140826612">
53 53
       <usages-collector id="statistics.lifecycle.project">
54 54
         <counts>
55
+          <entry key="project.closed" value="1" />
55 56
           <entry key="project.open.time.0" value="1" />
56
-          <entry key="project.opened" value="1" />
57
+          <entry key="project.open.time.7" value="1" />
58
+          <entry key="project.opened" value="2" />
57 59
         </counts>
58 60
       </usages-collector>
59 61
       <usages-collector id="statistics.file.extensions.open">
60 62
         <counts>
61
-          <entry key="sql" value="16" />
63
+          <entry key="pokemon_trainer" value="2" />
64
+          <entry key="pokemons" value="1" />
65
+          <entry key="sql" value="18" />
62 66
         </counts>
63 67
       </usages-collector>
64 68
       <usages-collector id="statistics.file.types.open">
65 69
         <counts>
66
-          <entry key="SQL" value="15" />
70
+          <entry key="Database Element" value="3" />
71
+          <entry key="SQL" value="17" />
67 72
           <entry key="Scratch" value="1" />
68 73
         </counts>
69 74
       </usages-collector>
70 75
       <usages-collector id="statistics.file.extensions.edit">
71 76
         <counts>
72
-          <entry key="sql" value="923" />
77
+          <entry key="sql" value="2582" />
73 78
         </counts>
74 79
       </usages-collector>
75 80
       <usages-collector id="statistics.file.types.edit">
76 81
         <counts>
77
-          <entry key="SQL" value="897" />
82
+          <entry key="SQL" value="2556" />
78 83
           <entry key="Scratch" value="26" />
79 84
         </counts>
80 85
       </usages-collector>
81 86
     </session>
82 87
   </component>
83 88
   <component name="FileEditorManager">
84
-    <leaf>
89
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
85 90
       <file pinned="false" current-in-tab="false">
86 91
         <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/38155f5d-6eb9-40b9-afae-ed307eb314b2/console.sql">
87 92
           <provider selected="true" editor-type-id="text-editor">
@@ -92,19 +97,19 @@
92 97
         </entry>
93 98
       </file>
94 99
       <file pinned="false" current-in-tab="false">
95
-        <entry file="file://$PROJECT_DIR$/Part2.sql">
100
+        <entry file="file://$PROJECT_DIR$/Part3.sql">
96 101
           <provider selected="true" editor-type-id="text-editor">
97
-            <state relative-caret-position="210">
98
-              <caret line="14" column="51" lean-forward="true" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
102
+            <state relative-caret-position="128">
103
+              <caret line="38" column="6" lean-forward="true" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
99 104
             </state>
100 105
           </provider>
101 106
         </entry>
102 107
       </file>
103 108
       <file pinned="false" current-in-tab="true">
104
-        <entry file="file://$PROJECT_DIR$/Part3.sql">
109
+        <entry file="file://$PROJECT_DIR$/Part4.sql">
105 110
           <provider selected="true" editor-type-id="text-editor">
106
-            <state relative-caret-position="221">
107
-              <caret line="18" column="45" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
111
+            <state relative-caret-position="30">
112
+              <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
108 113
             </state>
109 114
           </provider>
110 115
         </entry>
@@ -112,8 +117,8 @@
112 117
       <file pinned="false" current-in-tab="false">
113 118
         <entry file="file://$PROJECT_DIR$/pokemon_pokemon_trainer.sql">
114 119
           <provider selected="true" editor-type-id="text-editor">
115
-            <state relative-caret-position="219">
116
-              <caret line="672" column="132" lean-forward="true" selection-start-line="672" selection-start-column="132" selection-end-line="672" selection-end-column="132" />
120
+            <state relative-caret-position="284">
121
+              <caret line="19" column="130" selection-start-line="19" selection-start-column="130" selection-end-line="19" selection-end-column="130" />
117 122
             </state>
118 123
           </provider>
119 124
         </entry>
@@ -121,8 +126,8 @@
121 126
       <file pinned="false" current-in-tab="false">
122 127
         <entry file="file://$PROJECT_DIR$/pokemon_trainers.sql">
123 128
           <provider selected="true" editor-type-id="text-editor">
124
-            <state relative-caret-position="143">
125
-              <caret line="304" column="91" lean-forward="true" selection-start-line="304" selection-start-column="91" selection-end-line="304" selection-end-column="91" />
129
+            <state relative-caret-position="750">
130
+              <caret line="304" column="91" selection-start-line="304" selection-start-column="91" selection-end-line="304" selection-end-column="91" />
126 131
             </state>
127 132
           </provider>
128 133
         </entry>
@@ -157,19 +162,20 @@
157 162
       <list>
158 163
         <option value="$PROJECT_DIR$/pokemon_pokemons.sql" />
159 164
         <option value="$PROJECT_DIR$/pokemon_pokemon_trainer.sql" />
160
-        <option value="$PROJECT_DIR$/pokemon_trainers.sql" />
161 165
         <option value="$PROJECT_DIR$/pokemon_types.sql" />
162 166
         <option value="$APPLICATION_CONFIG_DIR$/consoles/db/38155f5d-6eb9-40b9-afae-ed307eb314b2/console.sql" />
163 167
         <option value="$PROJECT_DIR$/Part2.sql" />
164 168
         <option value="$PROJECT_DIR$/Part3.sql" />
169
+        <option value="$PROJECT_DIR$/pokemon_trainers.sql" />
170
+        <option value="$PROJECT_DIR$/Part4.sql" />
165 171
       </list>
166 172
     </option>
167 173
   </component>
168 174
   <component name="ProjectFrameBounds">
169
-    <option name="x" value="142" />
170
-    <option name="y" value="221" />
171
-    <option name="width" value="1080" />
172
-    <option name="height" value="608" />
175
+    <option name="x" value="150" />
176
+    <option name="y" value="23" />
177
+    <option name="width" value="1220" />
178
+    <option name="height" value="748" />
173 179
   </component>
174 180
   <component name="ProjectView">
175 181
     <navigator proportions="" version="1">
@@ -195,6 +201,7 @@
195 201
     <property name="GoToClass.toSaveIncludeLibraries" value="true" />
196 202
     <property name="database.console.LAST_STATE" value="true" />
197 203
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
204
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
198 205
   </component>
199 206
   <component name="RunDashboard">
200 207
     <option name="ruleStates">
@@ -209,25 +216,46 @@
209 216
     </option>
210 217
   </component>
211 218
   <component name="ToolWindowManager">
212
-    <frame x="142" y="221" width="1080" height="608" extended-state="0" />
219
+    <frame x="150" y="23" width="1220" height="748" extended-state="0" />
213 220
     <editor active="true" />
214 221
     <layout>
215 222
       <window_info id="Favorites" order="0" side_tool="true" />
216
-      <window_info content_ui="combo" id="Database" order="1" weight="0.2495183" />
217
-      <window_info content_ui="combo" id="Project" order="2" visible="true" weight="0.2495183" />
218
-      <window_info active="true" anchor="bottom" id="Database Console" visible="true" weight="0.32945737" />
219
-      <window_info anchor="bottom" id="Database Changes" />
220
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
221
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
223
+      <window_info content_ui="combo" id="Database" order="1" visible="true" weight="0.2606112" />
224
+      <window_info content_ui="combo" id="Project" order="2" weight="0.20958512" />
222 225
       <window_info anchor="bottom" id="Message" order="0" />
223 226
       <window_info anchor="bottom" id="Find" order="1" />
224 227
       <window_info anchor="bottom" id="Run" order="2" weight="0.32945737" />
225 228
       <window_info anchor="bottom" id="Inspection" order="3" weight="0.4" />
226 229
       <window_info anchor="bottom" id="TODO" order="4" />
230
+      <window_info active="true" anchor="bottom" id="Database Console" order="5" visible="true" weight="0.3628049" />
231
+      <window_info anchor="bottom" id="Database Changes" order="6" weight="0.3292683" />
232
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
233
+      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
227 234
       <window_info anchor="right" id="Structure" order="0" side_tool="true" weight="0.25" />
228 235
     </layout>
229 236
   </component>
230 237
   <component name="editorHistoryManager">
238
+    <entry file="file://$PROJECT_DIR$/Part2.sql">
239
+      <provider selected="true" editor-type-id="text-editor">
240
+        <state relative-caret-position="105">
241
+          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
242
+        </state>
243
+      </provider>
244
+    </entry>
245
+    <entry file="das://38155f5d-6eb9-40b9-afae-ed307eb314b2/schema/pokemon/table/pokemon_trainer">
246
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
247
+        <state>
248
+          <filtering enabled="true" />
249
+        </state>
250
+      </provider>
251
+    </entry>
252
+    <entry file="das://38155f5d-6eb9-40b9-afae-ed307eb314b2/schema/pokemon/table/pokemons">
253
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
254
+        <state>
255
+          <filtering enabled="true" />
256
+        </state>
257
+      </provider>
258
+    </entry>
231 259
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/38155f5d-6eb9-40b9-afae-ed307eb314b2/console.sql">
232 260
       <provider selected="true" editor-type-id="text-editor">
233 261
         <state relative-caret-position="30">
@@ -235,31 +263,31 @@
235 263
         </state>
236 264
       </provider>
237 265
     </entry>
238
-    <entry file="file://$PROJECT_DIR$/Part2.sql">
266
+    <entry file="file://$PROJECT_DIR$/Part3.sql">
239 267
       <provider selected="true" editor-type-id="text-editor">
240
-        <state relative-caret-position="210">
241
-          <caret line="14" column="51" lean-forward="true" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
268
+        <state relative-caret-position="128">
269
+          <caret line="38" column="6" lean-forward="true" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
242 270
         </state>
243 271
       </provider>
244 272
     </entry>
245
-    <entry file="file://$PROJECT_DIR$/pokemon_trainers.sql">
273
+    <entry file="file://$PROJECT_DIR$/pokemon_pokemons.sql">
246 274
       <provider selected="true" editor-type-id="text-editor">
247
-        <state relative-caret-position="143">
248
-          <caret line="304" column="91" lean-forward="true" selection-start-line="304" selection-start-column="91" selection-end-line="304" selection-end-column="91" />
275
+        <state relative-caret-position="30">
276
+          <caret line="2" column="86" selection-start-line="2" selection-start-column="82" selection-end-line="2" selection-end-column="86" />
249 277
         </state>
250 278
       </provider>
251 279
     </entry>
252
-    <entry file="file://$PROJECT_DIR$/pokemon_pokemon_trainer.sql">
280
+    <entry file="file://$PROJECT_DIR$/pokemon_trainers.sql">
253 281
       <provider selected="true" editor-type-id="text-editor">
254
-        <state relative-caret-position="219">
255
-          <caret line="672" column="132" lean-forward="true" selection-start-line="672" selection-start-column="132" selection-end-line="672" selection-end-column="132" />
282
+        <state relative-caret-position="750">
283
+          <caret line="304" column="91" selection-start-line="304" selection-start-column="91" selection-end-line="304" selection-end-column="91" />
256 284
         </state>
257 285
       </provider>
258 286
     </entry>
259
-    <entry file="file://$PROJECT_DIR$/pokemon_pokemons.sql">
287
+    <entry file="file://$PROJECT_DIR$/pokemon_pokemon_trainer.sql">
260 288
       <provider selected="true" editor-type-id="text-editor">
261
-        <state relative-caret-position="30">
262
-          <caret line="2" column="86" selection-start-line="2" selection-start-column="82" selection-end-line="2" selection-end-column="86" />
289
+        <state relative-caret-position="284">
290
+          <caret line="19" column="130" selection-start-line="19" selection-start-column="130" selection-end-line="19" selection-end-column="130" />
263 291
         </state>
264 292
       </provider>
265 293
     </entry>
@@ -270,10 +298,10 @@
270 298
         </state>
271 299
       </provider>
272 300
     </entry>
273
-    <entry file="file://$PROJECT_DIR$/Part3.sql">
301
+    <entry file="file://$PROJECT_DIR$/Part4.sql">
274 302
       <provider selected="true" editor-type-id="text-editor">
275
-        <state relative-caret-position="221">
276
-          <caret line="18" column="45" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
303
+        <state relative-caret-position="30">
304
+          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
277 305
         </state>
278 306
       </provider>
279 307
     </entry>

+ 33
- 6
pokemon_sql/Part3.sql Просмотреть файл

@@ -1,21 +1,48 @@
1 1
 /* What is each pokemon's primary type? */
2
-SELECT p.name, t.name FROM pokemon.pokemons p
2
+SELECT p.name, t.name
3
+FROM pokemon.pokemons p
3 4
 JOIN pokemon.types t
4 5
 ON p.primary_type = t.id;
5 6
 
6 7
 /* What is Rufflet's secondary type? */
7
-SELECT p.name, t.name FROM pokemon.pokemons p
8
+SELECT p.name, t.name
9
+FROM pokemon.pokemons p
8 10
 JOIN pokemon.types t
9
-ON p.primary_type = t.id WHERE p.name = "Rufflet";
11
+ON p.secondary_type = t.id WHERE p.name = "Rufflet";
10 12
 
11 13
 /* What are the names of the pokemon that belong to the trainer with trainerID 303?*/
12 14
 SELECT p.name, tr.trainerID
13 15
 FROM pokemon.pokemons p
14 16
 JOIN pokemon.pokemon_trainer tr ON p.id = tr.pokemon_id
15
-GROUP BY p.name, tr.trainerID
16
-HAVING trainerID = 303;
17
+/*GROUP BY p.name, tr.trainerID*/
18
+WHERE trainerID = 303;
17 19
 
18 20
 /*How many pokemon have a secondary type Poison*/
19
-SELECT p.primary_type, p.secondary_type COUNT
21
+SELECT t.name,
22
+COUNT(p.secondary_type) as 'Poison Secondaries'
23
+FROM pokemon.pokemons p
24
+JOIN pokemon.types t
25
+ON p.secondary_type = t.id
26
+WHERE t.name = "Poison";
27
+
28
+/*What are all the primary types and how many pokemon have that type?*/
29
+SELECT t.name,
30
+COUNT(p.id) as 'How Many'
20 31
 FROM pokemon.pokemons p
21 32
 JOIN pokemon.types t
33
+ON p.primary_type = t.id
34
+GROUP BY t.name;
35
+
36
+/*How many pokemon at level 100 does each trainer with at least one level 100 pokemon have? (Hint: your query should not display a trainer*/
37
+SELECT COUNT(pokelevel) as 'Lvl 100s'
38
+FROM pokemon.pokemon_trainer
39
+WHERE pokelevel = 100
40
+GROUP BY trainerID;
41
+
42
+/*How many pokemon only belong to one trainer and no other?*/
43
+SELECT COUNT(1) FROM
44
+(SELECT COUNT(p.pokemon_id) as 'Poke ID'
45
+FROM pokemon.pokemon_trainer p
46
+GROUP BY p.pokemon_id
47
+HAVING COUNT(*) = 1) pokemon
48
+

+ 23
- 0
pokemon_sql/Part4.sql Просмотреть файл

@@ -0,0 +1,23 @@
1
+/*Steel pokemon have the most resistances to various other damage types so I figured the highest level
2
+ Steel types would be the strongest*/
3
+
4
+SELECT
5
+  p.name as 'Pokemon Name',
6
+  tr.trainername as 'Trainer Name',
7
+  ptr.pokelevel AS 'Current Level',
8
+  typ.name AS 'Primary Type',
9
+  typ2.name AS 'Secondary Type'
10
+FROM
11
+  pokemon.pokemon_trainer ptr
12
+JOIN pokemon.pokemons p
13
+ON ptr.pokemon_id = p.id
14
+JOIN pokemon.trainers tr
15
+ON ptr.trainerID = tr.trainerID
16
+JOIN pokemon.types typ
17
+ON p.primary_type = typ.id
18
+JOIN pokemon.types typ2
19
+ON p.secondary_type = typ2.id
20
+WHERE typ.name = 'Steel'
21
+ORDER BY ptr.pokelevel DESC
22
+;
23
+