resolved merge conflict

Author: MathieuGuarino

module-1/Importing-Exporting-Data/your-code/.ipynb_checkpoints/main-checkpoint.ipynb

@@ -20,11 +20,91 @@
   },
   {
    "cell_type": "code",
+<<<<<<< HEAD
    "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
     "# your code here"
+=======
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pandas as pd\n",
+    "import os\n",
+    "\n",
+    "LOG = os.getenv('SQL_LOG')\n",
+    "PWD = os.getenv('SQL_PWD')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pymysql\n",
+    "from sqlalchemy import create_engine\n",
+    "\n",
+    "engine = create_engine(f'mysql+pymysql://{LOG}:{PWD}@localhost/sakila')\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "sql = '''SELECT * \n",
+    "FROM sakila.film_actor\n",
+    "LEFT JOIN sakila.actor\n",
+    "ON sakila.film_actor.actor_id = sakila.actor.actor_id'''\n",
+    "data = pd.read_sql_query(sql, engine)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "      actor_id  film_id         last_update  actor_id first_name last_name  \\\n",
+      "0            1        1 2006-02-15 05:05:03         1   PENELOPE   GUINESS   \n",
+      "1            1       23 2006-02-15 05:05:03         1   PENELOPE   GUINESS   \n",
+      "2            1       25 2006-02-15 05:05:03         1   PENELOPE   GUINESS   \n",
+      "3            1      106 2006-02-15 05:05:03         1   PENELOPE   GUINESS   \n",
+      "4            1      140 2006-02-15 05:05:03         1   PENELOPE   GUINESS   \n",
+      "...        ...      ...                 ...       ...        ...       ...   \n",
+      "5457       200      879 2006-02-15 05:05:03       200      THORA    TEMPLE   \n",
+      "5458       200      912 2006-02-15 05:05:03       200      THORA    TEMPLE   \n",
+      "5459       200      945 2006-02-15 05:05:03       200      THORA    TEMPLE   \n",
+      "5460       200      958 2006-02-15 05:05:03       200      THORA    TEMPLE   \n",
+      "5461       200      993 2006-02-15 05:05:03       200      THORA    TEMPLE   \n",
+      "\n",
+      "             last_update  \n",
+      "0    2006-02-15 04:34:33  \n",
+      "1    2006-02-15 04:34:33  \n",
+      "2    2006-02-15 04:34:33  \n",
+      "3    2006-02-15 04:34:33  \n",
+      "4    2006-02-15 04:34:33  \n",
+      "...                  ...  \n",
+      "5457 2006-02-15 04:34:33  \n",
+      "5458 2006-02-15 04:34:33  \n",
+      "5459 2006-02-15 04:34:33  \n",
+      "5460 2006-02-15 04:34:33  \n",
+      "5461 2006-02-15 04:34:33  \n",
+      "\n",
+      "[5462 rows x 7 columns]\n"
+     ]
+    }
+   ],
+   "source": [
+    "print(data)"
+>>>>>>> d9a83d1b53986889da694ea6186d7de8b05ec30f
    ]
   },
   {