#292

mgramin · mgramin · commit 03b0b28baf46 · 2019-04-20T10:52:03.000+03:00
diff --git a/conf/h2/sql/database/instance/locks/locks.sql b/conf/h2/sql/database/instance/locks/locks.sql
@@ -1,4 +1,3 @@
-````sql
 select "@schema"
      , "@table"
      , "@session"
@@ -7,4 +6,3 @@ select "@schema"
             , SESSION_ID   as "@session"
             , LOCK_TYPE
          from information_schema.LOCKS)
-````
diff --git a/conf/h2/sql/database/instance/query/query.sql b/conf/h2/sql/database/instance/query/query.sql
@@ -1,4 +1,3 @@
-````sql
 select "@statement" from (
 select SQL_STATEMENT as "@statement"
      , EXECUTION_COUNT
@@ -13,4 +12,3 @@ select SQL_STATEMENT as "@statement"
      , AVERAGE_ROW_COUNT
      , STD_DEV_ROW_COUNT
   from information_schema.QUERY_STATISTICS)
-````
diff --git a/conf/h2/sql/database/instance/sessions/sessions.sql b/conf/h2/sql/database/instance/sessions/sessions.sql
@@ -1,4 +1,3 @@
-````sql
 select "@id"          /* { "label": "id", "description": "ID", "visible": true } */
      , USER_NAME      /* { "label": "user", "description": "User name", "visible": true } */
      , session_start  /* { "label": "session start", "description": "Session start", "visible": true } */
@@ -12,4 +11,3 @@ select "@id"          /* { "label": "id", "description": "ID", "visible": true }
              , STATEMENT_START
              , CONTAINS_UNCOMMITTED
           from information_schema.sessions)
-````
diff --git a/conf/h2/sql/database/schema/schema.sql b/conf/h2/sql/database/schema/schema.sql
@@ -1,4 +1,3 @@
-````sql
 select "@schema"                    /* { "label": "schema", "description": "Schema", "visible": true } */
      , CATALOG_NAME                 /* { "label": "catalog", "description": "Catalog" } */
      , SCHEMA_OWNER                 /* { "label": "owner", "description": "Schema owner" } */
@@ -10,4 +9,3 @@ select "@schema"                    /* { "label": "schema", "description": "Sche
   from (select s.SCHEMA_NAME    as "@schema"
              , s.*
           from information_schema.SCHEMATA s)
-````
diff --git a/conf/h2/sql/database/schema/table/column/column.sql b/conf/h2/sql/database/schema/table/column/column.sql
@@ -1,4 +1,3 @@
-````sql
 select "@schema"                  /* { "label": "owner", "description": "Owner of the table", "visible": true } */
      , "@table"                   /* { "label": "table name", "description": "Name of the table", "visible": true } */
      , "@column"                  /* { "label": "column name", "description": "Name of the column", "visible": true } */
@@ -11,4 +10,3 @@ select "@schema"                  /* { "label": "owner", "description": "Owner o
              , c.column_name                as "@column"
              , c.*
           from information_schema.columns c)
-````
diff --git a/conf/h2/sql/database/schema/table/index/index.sql b/conf/h2/sql/database/schema/table/index/index.sql
@@ -1,4 +1,3 @@
-````sql
 select "@schema"    /* { "label": "owner", "description": "Owner of the table", "visible": true } */
      , "@table"     /* { "label": "table name", "description": "Name of the table", "visible": true } */
      , "@index"     /* { "label": "index name", "description": "Name of the index", "visible": true } */
@@ -24,4 +23,3 @@ select "@schema"    /* { "label": "owner", "description": "Owner of the table",
              , INDEX_NAME   as "@index"
              , i.*
           from information_schema.indexes i)
-````
diff --git a/conf/h2/sql/database/schema/table/pk/pk.sql b/conf/h2/sql/database/schema/table/pk/pk.sql
@@ -1,4 +1,3 @@
-````sql
   select "@schema"    /* { "label": "owner", "description": "Owner of the table", "visible": true } */
        , "@table"     /* { "label": "table name", "description": "Name of the table", "visible": true } */
        , "@pk"        /* { "label": "pk", "description": "Primary key name", "visible": true } */
@@ -10,4 +9,3 @@
                , c.constraint_name    as "@pk"
                , c.*
             from information_schema.constraints c)
-````
diff --git a/conf/h2/sql/database/schema/table/table.sql b/conf/h2/sql/database/schema/table/table.sql
@@ -1,4 +1,3 @@
-````sql
 select "@schema"            /* { "label": "owner", "description": "Owner of the table", "visible": true } */
      , "@table"             /* { "label": "table name", "description": "Name of the table", "visible": true } */
      , remarks              properties
@@ -11,4 +10,3 @@ select "@schema"            /* { "label": "owner", "description": "Owner of the
          where lower(t.table_schema) like lower('${uri.path(0)}')
            and lower(t.table_name) like lower('${uri.path(1)}'))
 order by "@schema", "@table"
-````
diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
@@ -22,7 +22,8 @@
   ~ SOFTWARE.
   -->
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>bin</id>
     <!--<baseDirectory>/</baseDirectory>-->
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
@@ -1,5 +1,9 @@
-insert into hr.users (id, first_name, email) values (1, 'mkyong', 'mkyong@gmail.com');
-insert into hr.users (id, first_name, email) values (2, 'alex', 'alex@yahoo.com');
-insert into hr.users (id, first_name, email) values (4, 'joel', 'joel@gmail.com');
+insert into hr.users (id, first_name, email)
+values (1, 'mkyong', 'mkyong@gmail.com');
+insert into hr.users (id, first_name, email)
+values (2, 'alex', 'alex@yahoo.com');
+insert into hr.users (id, first_name, email)
+values (4, 'joel', 'joel@gmail.com');
 
-insert into hr.jobs (id, name, description) values (1, 'driver', 'driver');
+insert into hr.jobs (id, name, description)
+values (1, 'driver', 'driver');
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -21,10 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-
 # Root logger option
 log4j.rootLogger=INFO, stdout
-
 # Direct log messages to stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
@@ -1,108 +1,126 @@
-drop schema hr if exists cascade;
+drop
+schema hr if exists cascade;
 create schema hr;
 
-create table hr.users (
-  id            integer,
-  first_name    varchar(30),
-  last_name     varchar(31),
-  email         varchar(50),
+create table hr.users
+(
+  id         integer,
+  first_name varchar(30),
+  last_name  varchar(31),
+  email      varchar(50),
   constraint users_pk primary key (id, first_name)
 );
 comment on table hr.users is 'all system users';
 
 create index hr.users_email_idx on hr.users (email, last_name);
 
-create view hr.users_view_materialized as select * from hr.users;
+create view hr.users_view_materialized as
+select *
+from hr.users;
 
 
-create table hr.jobs (
-  id            integer primary key,
-  name          varchar(30),
-  description   varchar(100),
+create table hr.jobs
+(
+  id          integer primary key,
+  name        varchar(30),
+  description varchar(100),
   constraint jobs_pk primary key (id)
 );
 comment on table hr.jobs is 'all jobs';
 
-create table hr.persons (
-  id            integer primary key,
-  id_job        integer,
-  id_user       integer,
+create table hr.persons
+(
+  id      integer primary key,
+  id_job  integer,
+  id_user integer,
   constraint persons_pk primary key (id)
 );
 comment on table hr.persons is 'all persons';
 
-alter table hr.persons add constraint person_to_jobs_fk foreign key (id_job) references hr.jobs(id);
-alter table hr.persons add constraint person_to_users_fk foreign key (id_user) references hr.users(id);
+alter table hr.persons
+  add constraint person_to_jobs_fk foreign key (id_job) references hr.jobs (id);
+alter table hr.persons
+  add constraint person_to_users_fk foreign key (id_user) references hr.users (id);
 
-create view hr.persons_view_materialized as select * from hr.persons;
+create view hr.persons_view_materialized as
+select *
+from hr.persons;
 
 
 
-create table hr.countries (
-  id            integer primary key,
-  name          varchar(50),
-  population    integer,
+create table hr.countries
+(
+  id         integer primary key,
+  name       varchar(50),
+  population integer,
   constraint countries_pk primary key (id)
 );
 
-create table hr.cities (
-  id            integer primary key,
-  name          varchar(50),
-  id_country    integer,
+create table hr.cities
+(
+  id         integer primary key,
+  name       varchar(50),
+  id_country integer,
   constraint cities_pk primary key (id)
 );
 
-create table hr.cities_2 (
-  id            integer primary key,
-  name          varchar(50),
-  id_country    integer,
+create table hr.cities_2
+(
+  id         integer primary key,
+  name       varchar(50),
+  id_country integer,
   constraint cities_2_pk primary key (id)
 );
 
 
 
-
-
-drop schema bookings if exists cascade;
+drop
+schema bookings if exists cascade;
 create schema bookings;
 
-create table bookings.aircrafts (
-    aircraft_code character(3) not null,
-    model         text not null,
-    range         integer not null,
-    constraint aircrafts_range_check check ((range > 0))
+create table bookings.aircrafts
+(
+  aircraft_code character(3) not null,
+  model         text         not null,
+  range         integer      not null,
+  constraint aircrafts_range_check check ((range > 0))
 );
 
-create table bookings.airports (
-    airport_code  character(3) not null,
-    airport_name  text not null,
-    city          text not null,
-    longitude     double precision not null,
-    latitude      double precision not null,
-    timezone text not null
+create table bookings.airports
+(
+  airport_code character(3)     not null,
+  airport_name text             not null,
+  city         text             not null,
+  longitude    double precision not null,
+  latitude     double precision not null,
+  timezone     text             not null
 );
 
-create table bookings.boarding_passes (
-    ticket_no     character(13) not null,
-    flight_id     integer not null,
-    boarding_no   integer not null,
-    seat_no       character varying(4) not null
+create table bookings.boarding_passes
+(
+  ticket_no   character(13)        not null,
+  flight_id   integer              not null,
+  boarding_no integer              not null,
+  seat_no     character varying(4) not null
 );
 
-create table bookings.bookings (
-    book_ref      character(6) not null,
-    book_date     timestamp not null,
-    total_amount  numeric(10,2) not null
+create table bookings.bookings
+(
+  book_ref     character(6)   not null,
+  book_date    timestamp      not null,
+  total_amount numeric(10, 2) not null
 );
 
-create table bookings.flights (
-    flight_id           integer not null,
-    flight_no           character(6) not null,
-    scheduled_departure timestamp not null,
-    scheduled_arrival   timestamp not null,
-    departure_airport   character(3) not null,
-    arrival_airport     character(3) not null,
-    status              character varying(20) not null,
-    aircraft_code       character(3) not null,
-    actual_departure    timestamp ,
-    actual_arrival      timestamp);
+create table bookings.flights
+(
+  flight_id           integer               not null,
+  flight_no           character(6)          not null,
+  scheduled_departure timestamp             not null,
+  scheduled_arrival   timestamp             not null,
+  departure_airport   character(3)          not null,
+  arrival_airport     character(3)          not null,
+  status              character varying(20) not null,
+  aircraft_code       character(3)          not null,
+  actual_departure    timestamp,
+  actual_arrival      timestamp
+);
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -23,4 +23,4 @@
   -->
 <h1>Bienvenido a <a href="https://github.com/sql-boot/sql-boot">sql-boot</a> !</h1>
 
-<p>First of all - check your <a href="connections">connections</a> </p>
+<p>First of all - check your <a href="connections">connections</a></p>
diff --git a/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt b/src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/impl/FsResourceTypeTest.kt
@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
-import org.springframework.core.io.ClassPathResource
 import org.springframework.core.io.FileSystemResource
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.junit.jupiter.SpringExtension
@@ -50,16 +49,19 @@ class FsResourceTypeTest {
 
     private val dbMd = SimpleDbConnection()
     private val dbSql = SimpleDbConnection()
+    private val connections = listOf(dbMd, dbSql)
 
     init {
-        dbMd.name = "unit_test_db"
+        dbMd.name = "unit_test_db_md"
         dbMd.baseFolder = FileSystemResource("conf/h2/md/database")
         dbMd.url = "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
         dbMd.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
-//        dbSql.name = "unit_test_db"
-//        dbSql.baseFolder = ClassPathResource("conf/h2/database")
-//        dbSql.url = "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
-//        dbSql.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
+
+        dbSql.name = "unit_test_db_sql"
+        dbSql.baseFolder = FileSystemResource("conf/h2/sql/database")
+        dbSql.url = "jdbc:h2:mem:;INIT=RUNSCRIPT FROM 'classpath:schema.sql';"
+        dbSql.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
+        dbSql.paginationQueryTemplate = "${'$'}{query} offset ${'$'}{uri.pageSize()*(uri.pageNumber()-1)} limit ${'$'}{uri.pageSize()}"
     }
 
     @ParameterizedTest
@@ -71,10 +73,12 @@ class FsResourceTypeTest {
             "prod/table/bookings,5",
             "prod/table/bookings.airports,1")
     fun read(uri: String, count: Long) =
-            StepVerifier
-                    .create(FsResourceType(listOf(dbMd)).read(DbUri(uri)))
-                    .expectNextCount(count)
-                    .verifyComplete()
+            connections.forEach {
+                StepVerifier
+                        .create(FsResourceType(listOf(it)).read(DbUri(uri)))
+                        .expectNextCount(count)
+                        .verifyComplete()
+            }
 
     @Test
     @Deprecated("Deprecated")
diff --git a/src/test/resources/db/sql/create-test-db.sql b/src/test/resources/db/sql/create-test-db.sql
diff --git a/src/test/resources/db/sql/init-test-data.sql b/src/test/resources/db/sql/init-test-data.sql
