sp generation

src/Generator/LuGenerator.php

@@ -2,6 +2,8 @@
 
 namespace Luticate\Generator;
 
+use Luticate\Utils\DataAccess\AbstractDbDataAccess;
+use Luticate\Utils\DataAccess\PgSqlDataAccess;
 use PDO;
 use Twig_Autoloader;
 use Twig_Environment;
@@ -58,17 +60,16 @@ class LuGenerator {
         $this->_config = $config;
     }
 
-    public function __construct()
+    public function __construct($database)
     {
-        $dsn = getenv("DB_CONNECTION") . ":dbname=" . getenv("DB_DATABASE") . ";host="
-            . getenv("DB_HOST") . ";port=" . getenv("DB_PORT");
-        $this->_pdo = new PDO($dsn, getenv("DB_USERNAME"), getenv("DB_PASSWORD"));
+        $dsn = $database["driver"] . ":dbname=" . $database["database"] . ";host="
+            . $database["host"] . ";port=" . $database["port"];
+        $this->_pdo = new PDO($dsn, $database["username"], $database["password"]);
     }
 
-    protected function printError($query, $message)
+    protected function printError($message)
     {
         echo $message . "\n";
-        var_dump($query->errorInfo());
         var_dump($this->_pdo->errorInfo());
         return null;
     }
@@ -108,60 +109,15 @@ class LuGenerator {
         $content = $template->render($twig_vars);
         file_put_contents($destFile, $content);
     }
-
-    public function getTables()
-    {
-        $tablesQuery = $this->_pdo->prepare("SELECT table_name
-FROM information_schema.tables
-WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'information_schema')");
-        if ($tablesQuery->execute(array())) {
-            $tables = $tablesQuery->fetchAll();
-            echo "Found " . count($tables) . " tables\n";
-            return $tables;
-        }
-        else
-            return $this->printError($tablesQuery, "Failed to get tables");
-    }
-
-    public function getColumns($table_name)
-    {
-        $columnsQuery = $this->_pdo->prepare("SELECT column_name as name, data_type as data_type FROM information_schema.columns WHERE table_name = :table_name");
-        if ($columnsQuery->execute(array(":table_name" => $table_name)))
-        {
-            $columns = $columnsQuery->fetchAll();
-            echo "Found " . count($columns) . " columns in table " . $table_name . "\n";
-            return $columns;
-        }
-        else
-            return $this->printError($columnsQuery, "Failed to get columns from " . $table_name);
-    }
-
-    public function sqlTypeToPhpType($type)
-    {
-        if ($type == "character" || $type == "character varying" || $type == "char"
-            || $type == "varchar" || $type == "bytea") {
-            return "string";
-        }
-        if ($type == "bigint" || $type == "bigserial" || $type == "serial8" || $type == "serial2"
-            || $type == "serial4" || $type == "int8" || $type == "int2" || $type == "integer" || $type == "smallint") {
-            return "integer";
-        }
-        if ($type == "decimal" || $type == "real" || $type == "double precision" || $type == "float8") {
-            return "double";
-        }
-        if ($type == "bit" || $type == "bit varying" || $type == "varbit" || $type == "boolean" || $type == "bool") {
-            return "boolean";
-        }
-        return $type;
-    }
-
+    
     public function sqlTypesToPhpTypes($array)
     {
+        $db = $this->getDbDataAccess();
         foreach ($array as $key => $value)
         {
             $array[$key]["data_type"] = array(
                 "sql" => $array[$key]["data_type"],
-                "php" => $this->sqlTypeToPhpType($array[$key]["data_type"])
+                "php" => $db->sqlTypeToPhpType($array[$key]["data_type"])
             );
         }
         return $array;
@@ -177,61 +133,26 @@ WHERE table_type = 'BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'informat
         $this->buildTwig('dbo_array.php', $fileArray, $vars);
     }
 
-    public function getStoredProcedures()
+    public function generateSp($sp, $file, $spFile, $dboName, $dboFile, $dboFileArray)
     {
-        $spQuery = $this->_pdo->prepare("SELECT r.routine_name AS sp_name, r.data_type AS data_type, proc.proretset AS proretset, proc.prosrc AS prosrc
-FROM information_schema.routines r
-LEFT JOIN pg_catalog.pg_proc proc ON proc.proname = r.routine_name
-WHERE r.specific_schema='public'");
-        if ($spQuery->execute())
-        {
-            $sp = $spQuery->fetchAll();
-            echo "Found " . count($sp) . " stored procedures\n";
-            return $sp;
-        }
-        else
-            return $this->printError($spQuery, "Failed to get stored procedures");
-    }
-
-    public function getStoredProceduresArguments($sp)
-    {
-        $sp_name = $sp["sp_name"];
-        $spQuery = $this->_pdo->prepare("SELECT parameters.parameter_name as name, parameters.data_type, parameters.parameter_mode
-FROM information_schema.routines
-JOIN information_schema.parameters ON routines.specific_name=parameters.specific_name
-WHERE routines.specific_schema='public' AND routines.routine_name = :sp_name
-ORDER BY parameters.ordinal_position;");
-        if ($spQuery->execute(array("sp_name" => $sp_name)))
-        {
-            $sp_ = $spQuery->fetchAll();
-            $sps = array("in" => array(), "out" => array());
-            foreach ($sp_ as $p)
-                $sps[strtolower($p["parameter_mode"])][] = $p;
-            $out_count = count($sps['out']);
-            if ($out_count == 0)
-            {
-                $sps['out'][] = array(
-                    "name" => $sp_name,
-                    "data_type" => $sp["data_type"],
-                    "parameter_mode" => "OUT"
-                );
-                $out_count = 1;
-            }
-            echo "Found " . count($sps['in']) . " input arguments for stored procedure " . $sp_name . "\n";
-            echo "Found " . $out_count . " output arguments for stored procedure " . $sp_name . "\n";
-            return $sps;
+        file_put_contents($spFile, $sp["sp"]["prosrc"]);
+        $args = [];
+        $db = $this->getDbDataAccess();
+        foreach ($sp['args']['out'] as $arg) {
+            $args[] = [
+                "name" => $arg["name"],
+                "data_type" => [
+                    "php" => $db->sqlTypeToPhpType($arg["data_type"]),
+                    "sql" => $arg["data_type"]
+                ]
+            ];
         }
-        else
-            return $this->printError($spQuery, "Failed to get arguments for stored procedure " . $sp_name);
-    }
-
-    public function generateSp($sp, $args, $file, $spFile)
-    {
-        $vars = array(
-            "sp" => $sp,
-            "args" => $args
-        );
-        file_put_contents($spFile, $sp["prosrc"]);
+        $this->generateDbo($dboName, $args, $dboFile, $dboFileArray);
+        $vars = [
+            "args" => $sp["args"],
+            "sp" => $sp["sp"],
+            "dboName" =>  $dboName
+        ];
         $this->buildTwig('sp.php', $file, $vars);
     }
 
@@ -310,16 +231,14 @@ ORDER BY parameters.ordinal_position;");
 
         $tables = $this->getTables();
         if (!is_null($tables)) {
-            foreach ($tables as $table) {
-                $table_name = $table["table_name"];
+            echo "Found " . count($tables) . " tables\n";
+            foreach ($tables as $table_name => $columns) {
                 if ($this->matchIgnore("tables", $table_name)) {
                     echo "Table $table_name ignored\n";
                     continue;
                 }
-                $columns = $this->getColumns($table_name);
-                if (is_null($columns))
-                    continue;
                 $columns = $this->sqlTypesToPhpTypes($columns);
+                echo "Found " . count($columns) . " columns in table " . $table_name . "\n";
                 $baseName = LuStringUtils::snakeToCamelCase($table_name, true);
                 $dboName = $baseName . "Dbo";
                 $dataAccessName = $baseName . "DataAccess";
@@ -338,24 +257,54 @@ ORDER BY parameters.ordinal_position;");
                     $controller_dir . $controllerName . ".php");
             }
         }
+        else {
+            $this->printError("Failed to get tables");
+        }
         $sps = $this->getStoredProcedures();
         if (!is_null($sps)) {
-            foreach ($sps as $sp)
+            echo "Found " . count($sps) . " stored procedures\n";
+            foreach ($sps as $sp_name => $sp)
             {
-                $sp_name = $sp["sp_name"];
                 if ($this->matchIgnore("sp", $sp_name)) {
                     echo "Stored procedure $sp_name ignored\n";
                     continue;
                 }
-                $args = $this->getStoredProceduresArguments($sp);
-                if (is_null($args))
-                    continue;
+                $args = $sp["args"];
+                echo "Found " . count($args['in']) . " input and " .
+                    count($args['out']) . " output arguments in stored procedure " . $sp_name . "\n";
                 $args["in"] = $this->sqlTypesToPhpTypes($args["in"]);
                 $args["out"] = $this->sqlTypesToPhpTypes($args["out"]);
                 $sp_model_name = LuStringUtils::snakeToCamelCase($sp_name, true);
-                $this->generateSp($sp, $args, $sp_dir . $sp_model_name . ".php", $sp_src_dir . $sp_name . ".sql");
+                $dboName = $sp_model_name . "Dbo";
+                $this->generateSp($sp, $sp_dir . $sp_model_name . ".php", $sp_src_dir . $sp_name . ".sql", $dboName,
+                    $dbo_dir . $dboName . ".php", $dbo_dir . $dboName . "Array.php");
             }
         }
+        else {
+            $this->printError("Failed to get stored procedures");
+        }
+    }
+
+    public function getStoredProcedures()
+    {
+        return $this->getDbDataAccess()->getStoredProceduresFull($this->_pdo);
+    }
+
+    public function getTables()
+    {
+        return $this->getDbDataAccess()->getTablesFull($this->_pdo);
+    }
+
+    /**
+     * @return AbstractDbDataAccess|null
+     */
+    public function getDbDataAccess()
+    {
+        $driver = $this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
+        if ($driver == "pgsql") {
+            return new PgSqlDataAccess();
+        }
+        return null;
     }
 }
 

src/Generator/templates/sp.php.twig

@@ -7,30 +7,15 @@
 
 namespace {{ sp_namespace.as_it }};
 
-use Luticate\Utils\LuSpDbo;
-use Luticate\Utils\LuMultipleDbo;
-use Luticate\Utils\LuStringUtils;
-use Illuminate\Support\Facades\DB;
-
-class {{ sp.sp_name.camel_upper }} extends LuSpDbo {
-
-    /**
-    * @param $dam
-    * @return \{{ sp_namespace.as_it }}\{{ sp.sp_name.camel_upper }}|null
-    */
-    protected static function damToDbo($dam)
-    {
-        if (is_null($dam))
-            return null;
-        $dbo = new {{ sp.sp_name.camel_upper }}();
-
-{% for arg in args.out %}
-        $dbo->set{{ arg.name.camel_upper }}(LuStringUtils::convertJsonString($dam->{{ arg.name.as_it }}));
-{% endfor %}
-
-        return $dbo;
-    }
+use Luticate\Utils\DataAccess\LuStoredProcedure;
+use Luticate\Utils\Dbo\LuMultipleDbo;
+use Luticate\Utils\Business\LuStringUtils;
+use Luticate\Utils\Business\LuArrayUtils;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use {{ dbo_namespace.as_it }}\{{ dboName.camel_upper }};
+use {{ dbo_namespace.as_it }}\{{ dboName.camel_upper }}Array;
 
+class {{ sp.sp_name.camel_upper }} extends LuStoredProcedure {
 {% set spcall %}{{ sp.sp_name.as_it }}({% for arg in args.in %}:{{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %}){% endset %}
 {% set argsarray %}{% for arg in args.in %}":{{ arg.name.as_it }}" => ${{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %}{% endset %}
 
@@ -38,18 +23,22 @@ class {{ sp.sp_name.camel_upper }} extends LuSpDbo {
 {% for arg in args.in %}
     * @param ${{ arg.name.as_it }} {{ arg.data_type.php.as_it }}
 {% endfor %}
-    * @return \{{ sp_namespace.as_it }}\{{ sp.sp_name.camel_upper }}{% if sp.proretset %}[]{% endif %};
+    * @return {{ dboName.camel_upper }}{% if sp.proretset %}[]{% endif %}
     */
     public static function execute({% for arg in args.in %}${{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %})
     {
-        $values = DB::select('SELECT {% for arg in args.out %}to_json(data.{{ arg.name.as_it }}) AS {{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %} FROM {{ spcall }} data', array({{ argsarray }}));
+        $values = static::getConnection()->select('SELECT {% for arg in args.out %}to_json(data.{{ arg.name.as_it }}) AS {{ arg.name.as_it }}{{ loop.last ? "" : ", " }}{% endfor %} FROM {{ spcall }} data', array({{ argsarray }}));
+
 {% if sp.proretset %}
         $dboValues = array();
-        foreach ($values as $value)
-            $dboValues[] = self::damToDbo($value);
+        foreach ($values as $value) {
+            $json = LuArrayUtils::objectToArray($value);
+            $dboValues[] = {{ dboName.camel_upper }}::jsonDeserialize($json);
+        }
         return $dboValues;
 {% else %}
-        return self::damToDbo($values[0]);
+        $json = LuArrayUtils::objectToArray($values[0]);
+        return {{ dboName.camel_upper }}::jsonDeserialize($json);
 {% endif %}
     }
 
@@ -60,67 +49,20 @@ class {{ sp.sp_name.camel_upper }} extends LuSpDbo {
 {% endfor %}
     * @param $page int The page number, 0 based
     * @param $perPage int The number of items per page
-    * @return \Luticate\Utils\LuMultipleDbo;
+    * @return LuMultipleDbo
     */
     public static function getMultipleJson({% for arg in args.in %}${{ arg.name.as_it }}, {% endfor %}$page, $perPage)
     {
-        $values = DB::select('SELECT (SELECT count(*) FROM {{ spcall }}) as count, (SELECT json_agg(q) FROM (SELECT * FROM {{ spcall }} OFFSET (:page::int * :perPage::int) LIMIT :perPage) q) as data',
+        $values = static::getConnection()->select('SELECT (SELECT count(*) FROM {{ spcall }}) as count, (SELECT json_agg(q) FROM (SELECT * FROM {{ spcall }} OFFSET (:page::int * :perPage::int) LIMIT :perPage) q) as data',
             array({{ argsarray }}, ":page" => $page, ":perPage" => $perPage));
         $value = $values[0];
         if (is_null($value->data))
         {
             $value->data = '[]';
         }
-        $data = LuStringUtils::convertJsonString($value->data);
-        return new LuMultipleDbo($value->count, $data);
+        $json = LuStringUtils::convertJsonString($value->data);
+        $data = {{ dboName.camel_upper }}Array::jsonDeserialize($json);
+        return new LuMultipleDbo($value->count, $data->getArray());
     }
 {% endif %}
-
-    public function jsonSerialize()
-    {
-        return array(
-{% for arg in args.out %}
-            "{{ arg.name.camel_upper }}" => $this->_{{ arg.name.camel_lower }}{{ loop.last ? "" : "," }}
-{% endfor %}
-        );
-    }
-
-    public static function jsonDeserialize($json)
-    {
-        $dbo = new {{ sp.sp_name.camel_upper }}();
-{% for arg in args.out %}
-        if (isset($json["{{ arg.name.camel_upper }}"])) {
-            $dbo->set{{ arg.name.camel_upper }}($json["{{ arg.name.camel_upper }}"]);
-        }
-{% endfor %}
-        return $dbo;
-    }
-
-    public static function generateSample()
-    {
-        $dbo = new {{ sp.sp_name.camel_upper }}();
-{% for arg in args.out %}
-        $dbo->set{{ arg.name.camel_upper }}({% if arg.data_type.php.as_it == "double" %}42.42{%
-elseif arg.data_type.php.as_it == "integer" %}42{%
-elseif arg.data_type.php.as_it == "boolean" %}true{%
-else %}"sample string"{% endif %});
-{% endfor %}
-        return $dbo;
-    }
-
-{% for arg in args.out %}
-
-    /**
-    * @var {{ arg.data_type.php.as_it }}
-    */
-    protected $_{{ arg.name.camel_lower }};
-    public function get{{ arg.name.camel_upper }}()
-    {
-        return $this->_{{ arg.name.camel_lower }};
-    }
-    public function set{{ arg.name.camel_upper }}($value)
-    {
-        $this->_{{ arg.name.camel_lower }} = $value;
-    }
-{% endfor %}
 }

test/generate.php

@@ -10,9 +10,19 @@ use Luticate\Generator\LuGenerator;
 
 require_once('../vendor/autoload.php');
 
-Dotenv::load("..");
+$config = ['databases' => [
+    [
+        'name'      => 'mydb',
+        'driver'    => 'pgsql',
+        'host'      => '172.17.0.1',
+        'port'      => 5432,
+        'database'  => 'intra_betaclean',
+        'username'  => 'dev',
+        'password'  => 'dev'
+    ]
+]];
 
-$gen = new LuGenerator();
+$gen = new LuGenerator($config['databases'][0]);
 
 echo "\n\nDEFAULT\n\n";
 
@@ -20,8 +30,8 @@ $gen->run();
 
 $gen->setConfig(array("dbo" =>
     array(
-        "namespace" => 'Luticate\Package\DBO',
-        "folder" => 'generated/Package/DBO'
+        "namespace" => 'Luticate\Package\Dbo',
+        "folder" => 'generated/Package/Dbo'
     ),
     "models" =>
         array(

test/test.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/10/16
+ * Time: 3:09 PM
+ */
+
+
+use Luticate\Package\DataAccess\SP\SpGetAddresses;
+use Luticate\Utils\Controller\LuticateApplication;
+
+require_once "../vendor/autoload.php";
+
+require_once "generated/Package/DataAccess/SP/SpGetAddresses.php";
+require_once "generated/Package/Dbo/SpGetAddressesDbo.php";
+require_once "generated/Package/Dbo/SpGetAddressesDboArray.php";
+
+$config = ['databases' => [
+    [
+        'name'      => 'mydb',
+        'driver'    => 'pgsql',
+        'host'      => '172.17.0.1',
+        'database'  => 'intra_betaclean',
+        'username'  => 'dev',
+        'password'  => 'dev'
+    ]
+]];
+$app = new LuticateApplication($config);
+$app->setupDatabases();
+
+var_dump(SpGetAddresses::execute(""));