new changes

.idea/dataSources.local.xml

@@ -11,5 +11,10 @@
       <user-name>root</user-name>
       <introspection-schemas>*:@,pokemon</introspection-schemas>
     </data-source>
+    <data-source name="@localhost [2]" uuid="9692ec06-eb47-4eb6-819a-29da48bf180b">
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" family="MYSQL" exact-version="0.0" />
+      <secret-storage>master_key</secret-storage>
+      <first-sync>true</first-sync>
+    </data-source>
   </component>
 </project>

.idea/dataSources.xml

@@ -15,5 +15,19 @@
         <property name="yearIsDateType" value="false" />
       </driver-properties>
     </data-source>
+    <data-source source="LOCAL" name="@localhost [2]" uuid="9692ec06-eb47-4eb6-819a-29da48bf180b">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+        <property name="zeroDateTimeBehavior" value="convertToNull" />
+        <property name="tinyInt1isBit" value="false" />
+        <property name="characterEncoding" value="utf8" />
+        <property name="characterSetResults" value="utf8" />
+        <property name="yearIsDateType" value="false" />
+      </driver-properties>
+    </data-source>
   </component>
 </project>

.idea/workspace.xml

@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c1291005-d044-4020-b8d6-80d79d9718e0" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/PokemonSqlLab.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -46,18 +45,21 @@
     <session id="-185741068">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="4" />
+          <entry key="project.closed" value="11" />
           <entry key="project.open.time.0" value="1" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.3" value="1" />
+          <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.6" value="1" />
-          <entry key="project.opened" value="4" />
+          <entry key="project.opened" value="11" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="pokemon_trainer" value="2" />
           <entry key="pokemons" value="3" />
-          <entry key="sql" value="8" />
+          <entry key="sql" value="9" />
           <entry key="types" value="2" />
         </counts>
       </usages-collector>
@@ -65,7 +67,7 @@
         <counts>
           <entry key="Database Element" value="7" />
           <entry key="SQL" value="6" />
-          <entry key="Scratch" value="2" />
+          <entry key="Scratch" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
@@ -89,8 +91,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/a3460592-cb1f-49ff-a79f-d262905b63c5/console.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="33" column="97" selection-start-line="33" selection-start-column="97" selection-end-line="33" selection-end-column="97" />
+            <state relative-caret-position="180">
+              <caret line="13" column="20" lean-forward="true" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
             </state>
           </provider>
         </entry>
@@ -117,7 +119,7 @@
   <component name="ProjectFrameBounds">
     <option name="y" value="23" />
     <option name="width" value="1280" />
-    <option name="height" value="704" />
+    <option name="height" value="698" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -125,39 +127,39 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope">
-        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
+      <pane id="ProjectPane">
+        <subPane>
           <expand>
             <path>
-              <item name="PokemonSqlLab" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
-              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="PokemonSqlLab" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PokemonSqlLab" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="PokemonSqlLab" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
-              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
-              <item name="pokemon_sql" type="9f88c78c:ScopeViewTreeModel$FileNode" />
+              <item name="PokemonSqlLab" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PokemonSqlLab" type="462c0819:PsiDirectoryNode" />
+              <item name="pokemon_sql" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane">
-        <subPane>
+      <pane id="Scope">
+        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
           <expand>
             <path>
-              <item name="PokemonSqlLab" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PokemonSqlLab" type="462c0819:PsiDirectoryNode" />
+              <item name="PokemonSqlLab" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
             </path>
             <path>
-              <item name="PokemonSqlLab" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PokemonSqlLab" type="462c0819:PsiDirectoryNode" />
-              <item name="pokemon_sql" type="462c0819:PsiDirectoryNode" />
+              <item name="PokemonSqlLab" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
+              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
+              <item name="pokemon_sql" type="9f88c78c:ScopeViewTreeModel$FileNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -165,7 +167,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542319530959" />
-    <property name="database.console.LAST_STATE" value="true" />
+    <property name="database.console.LAST_STATE" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -196,17 +198,24 @@
       <workItem from="1542308986934" duration="1752000" />
       <workItem from="1542377403898" duration="5926000" />
       <workItem from="1542396134736" duration="3688000" />
+      <workItem from="1542408343339" duration="103000" />
+      <workItem from="1542646852512" duration="150000" />
+      <workItem from="1542660217301" duration="366000" />
+      <workItem from="1542665825196" duration="284000" />
+      <workItem from="1546539722757" duration="613000" />
+      <workItem from="1547078995713" duration="870000" />
+      <workItem from="1547329750827" duration="783000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12797000" />
+    <option name="totallyTimeSpent" value="15966000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1280" height="704" extended-state="0" />
+    <frame x="0" y="23" width="1280" height="698" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26171243" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2907916" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -220,10 +229,10 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info active="true" anchor="bottom" id="Database Console" order="7" visible="true" weight="0.4738562" />
+      <window_info anchor="bottom" id="Database Console" order="7" weight="0.4719472" />
       <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32724252" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -232,7 +241,7 @@
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Theme Preview" order="5" />
       <window_info anchor="right" id="Palette&#9;" order="6" />
-      <window_info anchor="right" id="Database" order="7" visible="true" weight="0.06623586" />
+      <window_info anchor="right" id="Database" order="7" visible="true" weight="0.08077545" />
       <window_info anchor="right" id="Maven Projects" order="8" />
     </layout>
   </component>
@@ -243,13 +252,7 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="das://cf9a62fc-8db4-4ef7-bc08-89a0833c5c24/schema/pokemon/table/pokemon_trainer">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="das://cf9a62fc-8db4-4ef7-bc08-89a0833c5c24/schema/pokemon/table/pokemon_trainer" />
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/cf9a62fc-8db4-4ef7-bc08-89a0833c5c24/console.sql">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -259,36 +262,21 @@
     <entry file="file://$PROJECT_DIR$/pokemon_sql/pokemon_types.sql">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/pokemon_trainer">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/pokemon_trainer" />
     <entry file="file://$PROJECT_DIR$/pokemon_sql/pokemon_trainers.sql">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2829" />
       </provider>
     </entry>
-    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/types">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/pokemons">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
+    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/types" />
+    <entry file="das://a3460592-cb1f-49ff-a79f-d262905b63c5/schema/pokemon/table/pokemons" />
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/9692ec06-eb47-4eb6-819a-29da48bf180b/console.sql">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/a3460592-cb1f-49ff-a79f-d262905b63c5/console.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="33" column="97" selection-start-line="33" selection-start-column="97" selection-end-line="33" selection-end-column="97" />
+        <state relative-caret-position="180">
+          <caret line="13" column="20" lean-forward="true" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
         </state>
       </provider>
     </entry>