From f7bbee1c8aea8e00cb9aba9d13a916ae00ee432c Mon Sep 17 00:00:00 2001 From: John Tims Date: Fri, 29 May 2020 09:17:08 -0600 Subject: [PATCH] Convert querydsl-example-sql-guice to use h2 memory db --- .../main/resources/META-INF/persistence.xml | 2 +- .../querydsl-example-sql-guice/h2.h2.db | Bin 55296 -> 0 bytes .../querydsl-example-sql-guice/pom.xml | 4 +-- .../src/main/resources/jdbc.properties | 8 ++--- .../src/main/sql/001_schema.sql | 29 ++++++++++++++++++ 5 files changed, 36 insertions(+), 7 deletions(-) delete mode 100644 querydsl-examples/querydsl-example-sql-guice/h2.h2.db create mode 100644 querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml b/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml index bdec835e4..457ed1e7c 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/src/main/resources/META-INF/persistence.xml @@ -11,7 +11,7 @@ - + diff --git a/querydsl-examples/querydsl-example-sql-guice/h2.h2.db b/querydsl-examples/querydsl-example-sql-guice/h2.h2.db deleted file mode 100644 index 0c45db01e61a4d26061313c868a7d90591cef1c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55296 zcmeI5Uu+vm9mkz`>`l|Aty?!u+q4}gO=9<)biLl#UJymQ-gRQ)KRJ8NrQ%_mGzksu zRi~pM(msGdf)@}1fllynM+K)l@c>WvfP}>H3=%x^REZPfftN!9r2AKXyY{-?*l|p) zJ1OQHDXw?+H^2G)J~KNrnfdK>ex5H&TwGYZrt$fCK1#n`uYJA|pWpAp4+ww&2!H?x zfWRRp@R^O#&(_T!dQAUD4zVjR9RxrC1V8`;K%hqg82@_&1u+l+0T2KI5Evi=!N8UG zpF9~Lhu{hbfB*=900@A)h^~}#xwsgQ8woZ|*Rkfc$RZIIzS_K&*k!toH?NcIVuYQWZ(b+Z1-j;i zhQ3Whq$_rA!4+5%;|Vsw*~B$Z$~YuEEc#@rpEU;5<>XJmdPDU15 zGcNE2cE%ORJK3I#Ty2%O%CE9_9)SP>>ZVKmo)=hDJLK_4D5C8!X009vA|06KWj=4_H`s}#=qx5@v zgg(M2>Eq;i`oIqefB*=900@A88ICDKzd7u#4}$&dJf9x>Qnq5KropSm^EIQCHTY^xE9A2a)f-jQ zC|Yi^B}%D8E|ZWgSy9uLtY&me(UWN_DK6%;WGZDOWSLh@wPNxY^5!y^6s{SCa%rh* znPtmVwSvLUPa^hGfvX4BbJQct&*myqQ40%!Tm z*e{3Ff@xH^V}k3Q`GR4XR;^0us;={Fxl}bPYQAK;0=X4ADW$Zmu4I$?qMFXgJXfw5 z`K1zHF>XYQM#;=mCM&PUc)p|?Yx`%kocmUaSB#udu^CrgVcUSHt)f)UE*seuHp3%h zs|`ZEsx6mXbx*zW7|5;=hBy1fpeT}-mNdzOp+OE2-5_i*d0Qf-i{EO z=CLUv@W#Fb_H6?xMU_+OgrZ9sT@<~(7s^@HZUdc~z@B^!@8u3Hz}4ab5Fr4c>kME& z&3pWhx_WKv7$@%^J+t@8w3?E%jOeNP)iQMtl`g)!xw`n?*7`4#-^*S7ZqvHg@27UL zOXT(44$pp!& zqgfW4B_O0T2KI z5C8!X7!U%Jh0T|(?U&c@-3h((E8C}Y!@i+O;a>yd9^3!{5C8!X009taClF{E|1UZ3 z|4$6JOCbdWKmY_l00cl_KnaA_enOtv@qZ&B;RmOL)al?`X9Bz9fy`O<#|d`xy#EUW z>N(s3fsd5{9X-y+J{oGo=44e064bqcj84?hC>_hq^E%h^OLhpOZsgQj!Q|1Bv1anm ztA(0j$8NdtJkJu@X-6oUyi_X`oDVys(=Ek~5bZ~O-0{E-ej<}A*=4m7l@=FcqcJ*d zosVsIVbBux=;(37{#+ie>Ge`tLO1scP+4aw>}tD1*p;JmpE$vmur9gxxGR~BQ{2_3 zdyBi0TjH)9Q|x#_I&q$ly)}FgnP`8_qnAM3KAJ}_>gyFpm`w`1^|X%qot9w7MwQmn zo56q`D*7~4^urDn?dm$Xu9ch{A!vs==gpdK#Cd^YLhWw{1q&+d6xDvMQFlEB3o0#b zz_pU%Jll(AA@XgfKi_(9$4Y4WyLKlSWwNw0&R4f0 zeELSYP^LTKpmYAuss0Ut1`q%N5C8!X0D;3oAoQYr^q;f-KP3EpSlI9fKV-q1fxrjB zKt*8hjIis6#TD2I0wC~-5{S}T<$ZF?EAvUuiY6(H+ecow%d{Qxw!Ze9oTJ6soeoR&2U_6KVlUu!D5>Ec zt>re1nx%F9Uv%8{Ij}rem$T+i7kgK}>kH%LIT=D5I*m=8=5o1b`FvTeF56=DyBe)I zuQcwD#zvR(x^9&0^D3+cm-=}X2U=KvS>Cp@ej>-dOsY{wAZDLl@k$RZq}osOkUY)f z=?n86s;jk1CHt(3oBcKnY5#^%wKsaEs6Bk+ncG8k?*@>!*0md^VP(rTY7X`N!+Les zD~D>oS=SLhyH+(!Uia40YWafB6KOFN;M8L{PMC>>OwBpYZ?n zr2n-~v`0Zya!)_bR&Hc#!_L{XsDxKEo z(5FN)ONTy*s%U9?CS{3+s;Q!;NXdlQ$6j+U>g&CqyN%2BG98CyG!ost)<)`R>>3?t zEu@CRw^;a zouPbgOHOYpl(LbMQ`_?5t;A+p+)QUO>l@oiO4$?@McGJht!L8dL~2V(rp2@@ij=x7 z-jWiV${dZb#e6AF1M;gq49J$Qnrc6Tvf>$(oe4;f6E@{JYV=?1(CEFy4jA2?$DxCa zJ$bQxi`GrLN>9hP-Foo^=^R*EQRC(S&N036aRl4|NmdJ&&3xI009sH0T38? z0wKW}|3@+Y4}4X_K@b1|5C8!XXc7qfo%p{a%>;Y_0T2KI5C8!X7UTF-8 false 3.0 - 1.3.170 + 1.4.186 @@ -115,7 +115,7 @@ org.h2.Driver - jdbc:h2:${project.basedir}/h2 + jdbc:h2:mem:;INIT=runscript from 'file:${project.baseUri}/src/main/sql/001_schema.sql' sa com.querydsl.example.sql.model ${project.basedir}/target/generated-sources/java diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties b/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties index 969adc5c3..8e1552f3e 100644 --- a/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties +++ b/querydsl-examples/querydsl-example-sql-guice/src/main/resources/jdbc.properties @@ -1,4 +1,4 @@ -jdbc.url = jdbc:h2:h2 -jdbc.user = sa -jdbc.password = -jdbc.driver = org.h2.Driver \ No newline at end of file +jdbc.url=jdbc:h2:mem:testdb;INIT=runscript from 'src/main/sql/001_schema.sql' +jdbc.user=sa +jdbc.password= +jdbc.driver=org.h2.Driver \ No newline at end of file diff --git a/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql b/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql new file mode 100644 index 000000000..a8532d58a --- /dev/null +++ b/querydsl-examples/querydsl-example-sql-guice/src/main/sql/001_schema.sql @@ -0,0 +1,29 @@ +create schema if not exists PUBLIC; + +create table if not exists LOCATION +( + ID BIGINT auto_increment primary key, + LATITUDE DOUBLE, + LONGITUDE DOUBLE, +); + +create table if not exists USER +( + ID BIGINT auto_increment primary key, + USERNAME VARCHAR(255) +); + +create table if not exists TWEET +( + ID BIGINT auto_increment primary key, + CONTENT VARCHAR(255), + LOCATION_ID BIGINT, + POSTER_ID BIGINT not null, +); + +create table if not exists TWEET_USER +( + TWEET_ID BIGINT not null, + MENTIONS_ID BIGINT not null, +); +