Composer Issue

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 .*.sw?
 .idea
+/nbproject

README.md

@@ -1,4 +1,5 @@
-# laravel-firebird
+laravel-firebird
+================
 
 To use this package:
 
@@ -11,45 +12,143 @@ Mariuz's Blog has a very good step by step on this:
 http://mapopa.blogspot.com/2009/04/php5-and-firebird-pdo-on-ubuntu-hardy.html
 
 Install using composer:
-```json
-composer require jacquestvanzuydam/laravel-firebird
-```
 
-**For Laravel 5.1.* support, please look at the [5.1-support](https://github.com/jacquestvanzuydam/laravel-firebird/tree/5.1-support) branch.**
-
-**For Laravel 5.2.* support, please look at the [5.2-sup](https://github.com/jacquestvanzuydam/laravel-firebird/tree/5.2-sup) branch.**
-
-**For Laravel 5.3.* support, pleast look at the [5.3-support](https://github.com/jacquestvanzuydam/laravel-firebird/tree/5.3-support) branch.**
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ json
+composer require sim1984/laravel-firebird
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Update the `app/config/app.php`, add the service provider:
-```json
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ json
 'Firebird\FirebirdServiceProvider'.
-```
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can remove the original DatabaseServiceProvider, as the original connection factory has also been extended.
+For Laravel 5.7 and later:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ php
+Firebird\FirebirdServiceProvider::class,
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can remove the original DatabaseServiceProvider, as the original connection
+factory has also been extended.
 
 Declare your connection in the database config, using 'firebird' as the
-connecion type.
-Other keys that are needed:
-```php
+connecion type. Other keys that are needed:
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ php
 'firebird' => [
     'driver'   => 'firebird',
     'host'     => env('DB_HOST', 'localhost'),
     'database' => env('DB_DATABASE','/storage/firebird/APPLICATION.FDB'),
     'username' => env('DB_USERNAME', 'sysdba'),
     'password' => env('DB_PASSWORD', 'masterkey'),
     'charset'  => env('DB_CHARSET', 'UTF8'),
+    'role'     => 'RDB$ADMIN',
+    'engine_version' => '3.0.4',
 ],
-```
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 And add to your .env
-```
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 DB_CHARSET=UTF8
-```
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If necessary, change the UTF8 to any other charset
 
-This package is still in it's infancy and I wouldn't yet recommend using
-it for large projects, or without backing up your database regularly.
+This package is a branch jacquestvanzuydam/laravel-firebird package and extends
+its functionality. Tested on Laravel-5.7.
+
+Added the following features:
+
+-   Added support for direct control sequences in
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ php
+        // CREATE SEQUENCE "seq_users_id"
+        Schema::createSequence('seq_users_id');
+
+        // ALTER SEQUENCE "seq_users_id" RESTART WITH 10 INCREMENT BY 5
+        Schema::sequence('seq_users_id', function (SequenceBlueprint $sequence) {
+            $sequence->increment(5);
+            $sequence->restart(10);
+        });
+
+        // DROP SEQUENCE "seq_users_id"
+        Schema::dropSequence('seq_users_id');
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-   The implementation of auto-increment columns in two ways:
+
+-   through the automatic generation of sequences and before insert trigger
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ php
+        // CREATE TABLE "users" (
+        //   "id"              INTEGER NOT NULL PRIMARY KEY,
+        //   "name"            VARCHAR(255) NOT NULL,
+        //   "email"           VARCHAR(255) NOT NULL,
+        //   "password"        VARCHAR(255) NOT NULL,
+        //   "remember_token"  VARCHAR(100),
+        //   "created_at"      TIMESTAMP,
+        //   "updated_at"      TIMESTAMP
+        // );
+        // ALTER TABLE "users" ADD PRIMARY KEY ("id");
+        // ALTER TABLE "users" ADD CONSTRAINT "users_email_unique" UNIQUE ("email");
+        // CREATE SEQUENCE "seq_users";
+        // CREATE OR ALTER TRIGGER "tr_users_bi" FOR "users"
+        // ACTIVE BEFORE INSERT
+        // AS
+        // BEGIN
+        //   IF (NEW."id" IS NULL) THEN
+        //     NEW."id" = NEXT VALUE FOR "seq_users";
+        // END
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('email')->unique();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });
+
+        // DROP TABLE "users";
+        // DROP SEQUENCE "seq_users";
+        Schema::drop('users');
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-   using identity fields (only in Firebird 3.0).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ php
+        // CREATE TABLE "users" (
+        //   "id"              INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+        //   "name"            VARCHAR(255) NOT NULL,
+        //   "email"           VARCHAR(255) NOT NULL,
+        //   "password"        VARCHAR(255) NOT NULL,
+        //   "remember_token"  VARCHAR(100),
+        //   "created_at"      TIMESTAMP,
+        //   "updated_at"      TIMESTAMP
+        // );
+        // ALTER TABLE "users" ADD CONSTRAINT "users_email_unique" UNIQUE ("email");
+        Schema::create('users', function (Blueprint $table) {
+            $table->useIdentity(); // only Firebird 3.0
+            $table->increments('id');
+            $table->string('name');
+            $table->string('email')->unique();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });  
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-   The implementation of InsertGetId method is similar to the postgres, ie
+    using RETURNING proposal.
+
+-   Create your own base model class in which insertAndSetId method is
+    implemented through the prior receipt by the sequence identifier.
+
+-   Added additional methods for the execution of stored procedures and stored
+    functions.
+
+-   Added Providing the connection parameters: the name of the role and Firebird
+    version (to use the correct grammar).
 
-Any comments or contributions are welcome.
+ 

composer.json

@@ -1,25 +1,32 @@
 {
-    "name": "jacquestvanzuydam/laravel-firebird",
+    "name": "sim_1984/laravel-firebird",
     "description": "A Firebird database package for the Laravel Framework",
     "license": "MIT",
-    "version": "1.0.0.0",
+    "version": "1.0.3",
     "authors": [
         {
             "name": "Jacques van Zuydam",
             "email": "[email protected]"
+        },
+        {
+            "name": "Simonov Denis",
+            "email": "[email protected]"
         }
     ],
+    "prefer-stable": true,
     "minimum-stability": "dev",
     "require": {
-      "php": ">=5.4.0",
-      "illuminate/support": "5.0.*",
-      "illuminate/container": "5.0.*",
-      "illuminate/database": "5.0.*",
-      "illuminate/events": "5.0.*"
+        "php": "^7.1.3",
+        "ext-pdo": "*",
+        "illuminate/support": "5.7.*",
+        "illuminate/container": "5.7.*",
+        "illuminate/database": "5.7.*",
+        "illuminate/events": "5.7.*",
+        "doctrine/instantiator": "~1.0.3"
     },
     "autoload":{
-      "psr-0": {
-        "Firebird\\": "src/"
-      }
+        "psr-0": {
+            "Firebird\\": "src/"
+        }
     }
 }